diff --git a/src/bin/beep.cpp b/src/bin/beep.cpp
index 426f969f49..9c4386657c 100644
--- a/src/bin/beep.cpp
+++ b/src/bin/beep.cpp
@@ -1,27 +1,24 @@
-// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-//
-//	Copyright (c) 2001-2002, OpenBeOS
-//
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//
-//  File:        beep.cpp
-//  Author:      Mahmoud Al Gammal 
-//  Description: BeOS' command line "beep" command
-//  Created : Monday, September 23, 2002
-//
-// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+/*
+ * Copyright 2002-2006, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Mahmoud Al Gammal
+ */
+
 
 #include <Beep.h>
+
 #include <stdio.h>
 
+
 int
-main( int argc, char* argv[] )
+main(int argc, char* argv[])
 {
 
 	// "beep" can only take a single optional event name
-	if (argc > 2) {
+	if (argc > 2 
+		|| (argc == 2 && argv[1][0] == '-')) {
 		fprintf(stdout,"usage: beep [ eventname ]\n");
 		fprintf(stdout,"Event names are found in the Sounds preferences panel.\n");
 		fflush(stdout);		
@@ -29,11 +26,8 @@ main( int argc, char* argv[] )
 	}
 	
 	// if no event name is specified, play the default "Beep" event
-	if (argc == 1) {
+	if (argc == 1)
 		return beep();
-	}	else {
+	else
 		return system_beep(argv[1]);
-	}
 }
-
-// beep.c