diff --git a/debug.c b/debug.c
new file mode 100644
index 0000000..3026be7
--- /dev/null
+++ b/debug.c
@@ -0,0 +1,40 @@
+/*
+ *    This file is part of dicepwgen
+ *
+ *    Copyright (C) 2015 T.v.Dein.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *    You can contact me by mail: <tom AT vondein DOT org>.
+ */
+
+#include "debug.h"
+
+void debug(const char * fmt, ...) {
+  va_list ap;
+  char *err = NULL;
+
+  if(verbose) {
+    va_start(ap, fmt);
+  
+    if(vasprintf(&err, fmt, ap) >= 0) {
+      va_end(ap);
+      fprintf(stderr, "DEBUG%d: %s\n", verbose, err);
+      free(err);
+    }
+    else {
+      fprintf(stderr, "Could not store debug message %s!\n", fmt);
+    }
+  }
+}
diff --git a/debug.h b/debug.h
new file mode 100644
index 0000000..4dfb696
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,36 @@
+/*
+ *    This file is part of dicepwgen
+ *
+ *    Copyright (C) 2015 T.v.Dein.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *    You can contact me by mail: <tom AT vondein DOT org>.
+ */
+
+#ifndef HAVE_DEBUG_H
+#define HAVE_DEBUG_H
+
+#define _GNU_SOURCE
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "dicepwgen.h"
+
+extern int verbose;
+
+void debug(const char * fmt, ...);
+
+#endif