diff --git a/trunk/darkhttpd.c b/trunk/darkhttpd.c
index d405249..340813b 100644
--- a/trunk/darkhttpd.c
+++ b/trunk/darkhttpd.c
@@ -1,13 +1,35 @@
-static const char pkgname[]   = "darkhttpd/0.1";
+/* -darkhttpd-
+ * Copyright (c) 2003, Emil Mikulic.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+static const char pkgname[]   = "darkhttpd/1.0";
 static const char copyright[] = "copyright (c) 2003 Emil Mikulic";
 static const char rcsid[]     =
     "$Id$";
 
-/*
- * TODO:
- *  . Generate directory listings.
- */
-
 /* Note: Solaris users: link with -lxnet */
 
 #ifdef __linux
@@ -933,7 +955,13 @@ static void parse_commandline(const int argc, char *argv[])
     }
     if (strcmp(argv[1], "--version") == 0)
     {
-        printf("%s\n", rcsid);
+        printf("%s "
+#ifdef NDEBUG
+        "NDEBUG"
+#else
+        "!NDEBUG"
+#endif
+        "\n", rcsid);
         exit(EXIT_FAILURE);
     }