diff --git a/README.md b/README.md
index 1853328e..3be13f87 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
 
 Current snapshot in *sources*:
 
-* https://github.com/redmatrix/hubzilla: 3.2.2 (commit 8e46b072684d85d25037d9366f2507b4d171e7e8)
-* https://github.com/redmatrix/hubzilla-addons: 3.2.2 (commit 6db8413d4209e6b56313b827632b6c132b82875a)
+* https://github.com/redmatrix/hubzilla: 3.4 (commit be4c9a9598350fb4333480f0c7b302acebcddfd4)
+* https://github.com/redmatrix/hubzilla-addons: 3.4 (commit 5ab387a5177adb2aa289b3b5eeba445703021d55)
 
 ## To-Do's
 - [X] Installation and remove script.
diff --git a/conf/app.src b/conf/app.src
index bc1019a8..6e8c80d0 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/redmatrix/hubzilla/archive/3.2.2.zip
-SOURCE_SUM=e1a87334579adbabf7e84ecd599bdfa9
+SOURCE_URL=https://github.com/redmatrix/hubzilla/archive/3.4.zip
+SOURCE_SUM=f9c9f15ca151b5ebdd36a9528788d800
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=
diff --git a/conf/app_addons.src b/conf/app_addons.src
index ef6e76fb..3a61b473 100644
--- a/conf/app_addons.src
+++ b/conf/app_addons.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/redmatrix/hubzilla-addons/archive/3.2.2.zip
-SOURCE_SUM=05b4cbc853248fa855fb5941d9ea5ced
+SOURCE_URL=https://github.com/redmatrix/hubzilla-addons/archive/3.4.zip
+SOURCE_SUM=a4436a813c4f6f6d1e6c500953b961fe
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 95b05d9c..f375096f 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,15 +1,14 @@
-root __FINALPATH__/ ;
-location __PATH__  {
+  root __FINALPATH__/ ;
+  location __PATH__  {
 
   # Force https
   if ($scheme = http) {
   rewrite ^ https://$server_name$request_uri? permanent;
-  }
+      }
   
- if ($is_args != "") {
-        rewrite ^/(.*) /index.php?q=$uri&$args last;
-    }
-    rewrite ^/(.*) /index.php?q=$uri last;
+  if (!-e $request_filename) {
+     rewrite ^(.*)$ /index.php?q=$1;
+      }
   }
   
 
@@ -58,6 +57,6 @@ location __PATH__  {
 
 	location ~ /store {
         deny  all;
-	}
+  }
 
 
diff --git a/manifest.json b/manifest.json
index 20a2261e..dc59ca05 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
     },
     "url": "https://github.com/redmatrix/hubzilla",
     "license": "Free as-is",
-    "version": "3.2.2",
+    "version": "3.4",
     "maintainer": {
         "name": "Andrew Manning",
         "email": "andrew@reticu.li"
diff --git a/sources/hubzilla-addons/source_file b/sources/hubzilla-addons/source_file
deleted file mode 100644
index b29bb4b2..00000000
--- a/sources/hubzilla-addons/source_file
+++ /dev/null
@@ -1 +0,0 @@
-hubzilla-addons-3.2.2
diff --git a/sources/hubzilla-addons/source_md5 b/sources/hubzilla-addons/source_md5
deleted file mode 100644
index 74d309ed..00000000
--- a/sources/hubzilla-addons/source_md5
+++ /dev/null
@@ -1 +0,0 @@
-05b4cbc853248fa855fb5941d9ea5ced  hubzilla-addons-3.2.2.zip
diff --git a/sources/hubzilla-addons/source_url b/sources/hubzilla-addons/source_url
deleted file mode 100644
index 14369b5c..00000000
--- a/sources/hubzilla-addons/source_url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/redmatrix/hubzilla-addons/archive/3.2.2.zip
diff --git a/sources/hubzilla/source_file b/sources/hubzilla/source_file
deleted file mode 100644
index 84720dfa..00000000
--- a/sources/hubzilla/source_file
+++ /dev/null
@@ -1 +0,0 @@
-hubzilla-3.2.2
diff --git a/sources/hubzilla/source_md5 b/sources/hubzilla/source_md5
deleted file mode 100644
index 617b37a8..00000000
--- a/sources/hubzilla/source_md5
+++ /dev/null
@@ -1 +0,0 @@
-e1a87334579adbabf7e84ecd599bdfa9  hubzilla-3.2.2.zip
diff --git a/sources/hubzilla/source_url b/sources/hubzilla/source_url
deleted file mode 100644
index c1ed3268..00000000
--- a/sources/hubzilla/source_url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/redmatrix/hubzilla/archive/3.2.2.zip