diff --git a/Scripts/developer_scripts/cgal_create_package_dir.py b/Scripts/developer_scripts/cgal_create_package_dir.py
index d44ce0e7d65..34bb4aa148d 100755
--- a/Scripts/developer_scripts/cgal_create_package_dir.py
+++ b/Scripts/developer_scripts/cgal_create_package_dir.py
@@ -46,7 +46,7 @@ if re.match("^[A-Za-z_][A-Za-z0-9_]*$", packagename):
     os.mkdir(os.path.join(packagename, 'scripts'))
     os.mkdir(os.path.join(packagename, 'developer_scripts'))
 
-    infopath = os.path.join(packagename,'package_info', packagename)
+    infopath = os.path.join(packagename, 'package_info', packagename)
     os.makedirs(infopath)
     open(os.path.join(infopath, 'copyright.txt'), 'w').close()
     open(os.path.join(infopath, 'description.txt'), 'w').close()
@@ -54,6 +54,14 @@ if re.match("^[A-Za-z_][A-Za-z0-9_]*$", packagename):
     open(os.path.join(infopath, 'long_description.txt'), 'w').close()
     open(os.path.join(infopath, 'maintainer'), 'w').close()
 
+    docpath = os.path.join(packagename, 'doc', packagename)
+    os.makedirs(docpath)
+    os.mkdir(os.path.join(docpath, 'CGAL'))
+    os.mkdir(os.path.join(docpath, 'Concepts'))
+    os.mkdir(os.path.join(docpath, 'fig'))
+    open(os.path.join(docpath, 'examples.txt'), 'w').close()
+    open(os.path.join(docpath, (packagename + '.txt')), 'w').close()
+
 else:
     print "Error: Bad package name:", packagename
     print "The package name should consist of:"