diff --git a/MANIFEST.in b/MANIFEST.in
index e61e3251ca..9163c3d772 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 recursive-include platypush/backend/http/webapp/dist *
 include platypush/plugins/http/webpage/mercury-parser.js
+include platypush/config/*.yaml
 global-include manifest.yaml
diff --git a/platypush/config/config.auto.yaml b/platypush/config/config.auto.yaml
new file mode 100644
index 0000000000..466458baad
--- /dev/null
+++ b/platypush/config/config.auto.yaml
@@ -0,0 +1,7 @@
+# Auto-generated configuration file.
+# Do not edit manually - use the config.yaml file for manual modifications
+# instead
+
+backend.http:
+  port: 8008
+  websocket_port: 8009
diff --git a/platypush/config/config.default.yaml b/platypush/config/config.default.yaml
new file mode 100644
index 0000000000..1e36005fea
--- /dev/null
+++ b/platypush/config/config.default.yaml
@@ -0,0 +1,2 @@
+include:
+  - config.auto.yaml