diff --git a/source/dyaml/all.d b/source/dyaml/all.d
index 734df5c..0925267 100644
--- a/source/dyaml/all.d
+++ b/source/dyaml/all.d
@@ -4,15 +4,6 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-module dyaml.all;
+deprecated("Import dyaml instead") module dyaml.all;
 
-public import dyaml.constructor;
-public import dyaml.dumper;
-public import dyaml.encoding;
-public import dyaml.exception;
-public import dyaml.linebreak;
-public import dyaml.loader;
-public import dyaml.representer;
-public import dyaml.resolver;
-public import dyaml.style;
-public import dyaml.node;
+public import dyaml;
diff --git a/source/dyaml/package.d b/source/dyaml/package.d
new file mode 100644
index 0000000..6085992
--- /dev/null
+++ b/source/dyaml/package.d
@@ -0,0 +1,17 @@
+//          Copyright Ferdinand Majerech 2011.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+module dyaml;
+
+public import dyaml.constructor;
+public import dyaml.dumper;
+public import dyaml.encoding;
+public import dyaml.exception;
+public import dyaml.linebreak;
+public import dyaml.loader;
+public import dyaml.representer;
+public import dyaml.resolver;
+public import dyaml.style;
+public import dyaml.node;
diff --git a/source/yaml.d b/source/yaml.d
index 3551353..1582fd2 100644
--- a/source/yaml.d
+++ b/source/yaml.d
@@ -4,15 +4,6 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-module yaml;
+deprecated("Import dyaml instead") module yaml;
 
-public import dyaml.constructor;
-public import dyaml.dumper;
-public import dyaml.encoding;
-public import dyaml.exception;
-public import dyaml.linebreak;
-public import dyaml.loader;
-public import dyaml.representer;
-public import dyaml.resolver;
-public import dyaml.style;
-public import dyaml.node;
+public import dyaml;