diff --git a/examples/hello-world/main.c b/examples/hello-world/main.c
index c55bdfc660..fefbce0348 100644
--- a/examples/hello-world/main.c
+++ b/examples/hello-world/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Freie Universität Berlin
+ * Copyright (C) 2014 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
@@ -14,6 +14,7 @@
  * @brief       Hello World application
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
+ * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
  *
  * @}
  */
@@ -22,7 +23,6 @@
 
 int main(void)
 {
-    puts("Hello World!\n");
-
-    while (1);
+    puts("Hello World!");
+    return 0;
 }