diff --git a/roles/archorg/tasks/main.yml b/roles/archorg/tasks/main.yml
index 49c2c5ad2..833199985 100644
--- a/roles/archorg/tasks/main.yml
+++ b/roles/archorg/tasks/main.yml
@@ -13,6 +13,13 @@
     depth: 1
   when: internet_available
 
+- name: Install packages needed by Distributed Web
+  package:
+      name:
+         - libsecret-1-dev
+         - cmake
+      state: present
+
 - name: Run 'npm install --allow-root --unsafe-perm=true' to create /opt/iiab/archorg/node_modules (CAN TAKE ~5 MINUTES)
   command: npm install --allow-root --unsafe-perm=true
   args:
@@ -30,8 +37,8 @@
     owner: root
     group: root
   with_items:
-    - { src: 'archorg.service', dest: '/etc/systemd/system/archorg.service' }
-    - { src: 'archorg.conf.j2', dest: '/etc/apache2/sites-available/archorg.conf' }
+    - { src: 'archorg.service.j2', dest: '/etc/systemd/system/archorg.service' }
+    - { src: 'archorg.conf', dest: '/etc/apache2/sites-available/archorg.conf' }
 
 
 - name: Create symlink archorg.conf from sites-enabled to sites-available, for short URLs http://box/sugar & http://box/archorg (if archorg_enabled)
diff --git a/roles/archorg/templates/archorg.service.j2 b/roles/archorg/templates/archorg.service.j2
index 69d3c1750..4f59ff35b 100644
--- a/roles/archorg/templates/archorg.service.j2
+++ b/roles/archorg/templates/archorg.service.j2
@@ -11,7 +11,6 @@ RestartSec=10
 StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=archorg
-ExecStart={{ magrit_venv }}/bin/python3.5 {{ magrit_venv }}/magrit_app/app,py --port {{ magrit_port }} --address {{ lan_ip }}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/network/templates/gateway/iiab-gen-iptables b/roles/network/templates/gateway/iiab-gen-iptables
index 858786a14..123691fdc 100755
--- a/roles/network/templates/gateway/iiab-gen-iptables
+++ b/roles/network/templates/gateway/iiab-gen-iptables
@@ -63,6 +63,7 @@ cups_port={{ cups_port }}
 transmission_http_port={{ transmission_http_port }}
 transmission_peer_port={{ transmission_peer_port }}
 sugarizer_port={{ sugarizer_port }}
+archorg_port={{ archorg_port }}
 nodered_port={{ nodered_port }}
 mosquitto_port={{ mosquitto_port }}
 minetest_port={{ minetest_port }}
@@ -105,6 +106,7 @@ if [ "$services_externally_visible" == "True" ]; then
     $IPTABLES -A INPUT -p tcp --dport $calibreweb_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $cups_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT
+    $IPTABLES -A INPUT -p tcp --dport $archorg_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $nodered_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $mosquitto_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $transmission_http_port -m state --state NEW -i $wan -j ACCEPT