diff --git a/ChangeLog b/ChangeLog
index 3667b042..97c5b871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.0.0 () -
+
+- TI-34   Make timew more user-friendly by adding --help and default output
+          (thanks to Felix Wolfsteller).
 
 ------ current release ---------------------------
 
diff --git a/src/commands/CmdDefault.cpp b/src/commands/CmdDefault.cpp
index 4bdfe06a..38214f8e 100644
--- a/src/commands/CmdDefault.cpp
+++ b/src/commands/CmdDefault.cpp
@@ -45,7 +45,22 @@ int CmdDefault (Rules& rules, Database& database)
   else
   {
     if (rules.getBoolean ("verbose"))
-      std::cout << "There is no active time tracking.\n";
+    {
+      if (rules.getBoolean ("temp.shiny"))
+        std::cout << '\n'
+                  << "Welcome to Timewarrior.\n"
+                  << '\n'
+                  << "There is built-in help:\n"
+                  << "    timew help\n"
+                  << "    timew help <command>\n"
+                  << "    (and more)\n"
+                  << '\n'
+                  << "There is a fully-detailed man page:\n"
+                  << "    man timew\n"
+                  << '\n';
+      else
+        std::cout << "There is no active time tracking.\n";
+    }
 
     status = 1;
   }