diff --git a/actions/doc.php b/actions/doc.php
index 6957659add..ebffb7c154 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -50,7 +50,7 @@ class DocAction extends Action
 
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
@@ -59,7 +59,7 @@ class DocAction extends Action
     {
         parent::handle($args);
         $this->title    = $this->trimmed('title');
-        $this->filename = INSTALLDIR.'/doc/'.$this->title;
+        $this->filename = INSTALLDIR.'/doc-src/'.$this->title;
         if (!file_exists($this->filename)) {
             $this->clientError(_('No such document.'));
             return;
@@ -71,14 +71,14 @@ class DocAction extends Action
     function showPageTitle() {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
     }
-    
+
     // overrided to add hentry, and content-inner classes
     function showContentBlock()
      {
          $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
          $this->showPageTitle();
          $this->showPageNoticeBlock();
-         $this->elementStart('div', array('id' => 'content_inner', 
+         $this->elementStart('div', array('id' => 'content_inner',
              'class' => 'entry-content'));
          // show the actual content (forms, lists, whatever)
          $this->showContent();
@@ -88,7 +88,7 @@ class DocAction extends Action
 
     /**
      * Display content.
-     * 
+     *
      * @return nothing
      */
     function showContent()
@@ -100,7 +100,7 @@ class DocAction extends Action
 
     /**
      * Page title.
-     * 
+     *
      * @return page title
      */
     function title()
diff --git a/doc/about b/doc-src/about
similarity index 100%
rename from doc/about
rename to doc-src/about
diff --git a/doc/contact b/doc-src/contact
similarity index 100%
rename from doc/contact
rename to doc-src/contact
diff --git a/doc/faq b/doc-src/faq
similarity index 100%
rename from doc/faq
rename to doc-src/faq
diff --git a/doc/groups b/doc-src/groups
similarity index 100%
rename from doc/groups
rename to doc-src/groups
diff --git a/doc/help b/doc-src/help
similarity index 100%
rename from doc/help
rename to doc-src/help
diff --git a/doc/im b/doc-src/im
similarity index 100%
rename from doc/im
rename to doc-src/im
diff --git a/doc/openid b/doc-src/openid
similarity index 100%
rename from doc/openid
rename to doc-src/openid
diff --git a/doc/openmublog b/doc-src/openmublog
similarity index 100%
rename from doc/openmublog
rename to doc-src/openmublog
diff --git a/doc/privacy b/doc-src/privacy
similarity index 100%
rename from doc/privacy
rename to doc-src/privacy
diff --git a/doc/sms b/doc-src/sms
similarity index 100%
rename from doc/sms
rename to doc-src/sms
diff --git a/doc/source b/doc-src/source
similarity index 100%
rename from doc/source
rename to doc-src/source
diff --git a/doc/tags b/doc-src/tags
similarity index 100%
rename from doc/tags
rename to doc-src/tags