diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26d239d..8bd0272 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1 @@
-KDE_LANG = en
-KDE_DOCS = gwenview
+SUBDIRS = en man
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
new file mode 100644
index 0000000..26d239d
--- /dev/null
+++ b/doc/en/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = gwenview
diff --git a/doc/browse_mode.png b/doc/en/browse_mode.png
similarity index 100%
rename from doc/browse_mode.png
rename to doc/en/browse_mode.png
diff --git a/doc/dock_grip.png b/doc/en/dock_grip.png
similarity index 100%
rename from doc/dock_grip.png
rename to doc/en/dock_grip.png
diff --git a/doc/docked_windows.docbook b/doc/en/docked_windows.docbook
similarity index 100%
rename from doc/docked_windows.docbook
rename to doc/en/docked_windows.docbook
diff --git a/doc/external_tools.docbook b/doc/en/external_tools.docbook
similarity index 100%
rename from doc/external_tools.docbook
rename to doc/en/external_tools.docbook
diff --git a/doc/external_tools_dialog.png b/doc/en/external_tools_dialog.png
similarity index 100%
rename from doc/external_tools_dialog.png
rename to doc/en/external_tools_dialog.png
diff --git a/doc/index.docbook b/doc/en/index.docbook
similarity index 100%
rename from doc/index.docbook
rename to doc/en/index.docbook
diff --git a/doc/interface.docbook b/doc/en/interface.docbook
similarity index 100%
rename from doc/interface.docbook
rename to doc/en/interface.docbook
diff --git a/doc/introduction.docbook b/doc/en/introduction.docbook
similarity index 100%
rename from doc/introduction.docbook
rename to doc/en/introduction.docbook
diff --git a/doc/keybindings.docbook b/doc/en/keybindings.docbook
similarity index 100%
rename from doc/keybindings.docbook
rename to doc/en/keybindings.docbook
diff --git a/doc/mouse.docbook b/doc/en/mouse.docbook
similarity index 100%
rename from doc/mouse.docbook
rename to doc/en/mouse.docbook
diff --git a/doc/view_mode.png b/doc/en/view_mode.png
similarity index 100%
rename from doc/view_mode.png
rename to doc/en/view_mode.png
diff --git a/src/doc/Makefile.am b/doc/man/Makefile.am
similarity index 100%
rename from src/doc/Makefile.am
rename to doc/man/Makefile.am
diff --git a/src/doc/gwenview.1 b/doc/man/gwenview.1
similarity index 100%
rename from src/doc/gwenview.1
rename to doc/man/gwenview.1
diff --git a/src/Makefile.am b/src/Makefile.am
index 81a3b05..2c0f108 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tsthread imageutils gvcore pics desktopfiles doc tools updates gvimagepart gvdirpart app
+SUBDIRS = tsthread imageutils gvcore pics desktopfiles tools updates gvimagepart gvdirpart app
 
 EXTRA_DIST = AUTHORS ChangeLog COPYING INSTALL NEWS README TODO CREDITS DESIGN