diff --git a/common/MANIFEST.in b/common/MANIFEST.in
index 7f6148ef97db6f34122f2119e2a46a343eb76738..a26a12a65f52ec478301c7d32fc274d05efeacfd 100644
--- a/common/MANIFEST.in
+++ b/common/MANIFEST.in
@@ -2,3 +2,7 @@ include pkg/*
 include versioneer.py
 include LICENSE
 include CHANGELOG
+
+# What do we want the ddocs folder in the source package for? -- kali
+# it should be enough with having the compiled stuff.
+recursive-include src/leap/soledad/common/ddocs *
diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
new file mode 100644
index 0000000000000000000000000000000000000000..e57e50e54ba01e6209239caf4bb2672bc1106192
--- /dev/null
+++ b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
@@ -0,0 +1 @@
+o Bail out if cdocs/ dir does not exist. Closes: #6671
diff --git a/common/setup.py b/common/setup.py
index 6ee166ef5b0357afac011bee71469bedd0f8109c..365006b2918eadc207a94947c3a103c8a1bdde61 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -155,6 +155,11 @@ def build_ddocs_py(basedir=None, with_src=True):
         dest_prefix = join(basedir, *dest_common_path)
 
     ddocs_prefix = join(prefix, 'ddocs')
+
+    if not isdir(ddocs_prefix):
+        print "No ddocs/ folder, bailing out..."
+        return
+
     ddocs = {}
 
     # design docs are represented by subdirectories of `ddocs_prefix`