diff --git a/src/freedombone b/src/freedombone
index 5ef3d9fc..f6d19f97 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -9693,8 +9693,75 @@ function install_mediagoblin {
     # web config
     MEDIAGOBLIN_VIRTUAL_HOST=/etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
     nginx_http_redirect $MEDIAGOBLIN_DOMAIN_NAME
+    if [[ $ONION_ONLY == 'no' ]]; then
+        echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  listen 443 ssl;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  include /etc/nginx/mime.types;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  autoindex off;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
+        nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
+        nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_min_length 1024;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_buffers 4 32k;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  gzip_types text/plain application/x-javascript text/javascript text/xml text/css;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Mounting MediaGoblin stuff' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    # our understanding vs nginxs handling of script_name vs' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '      # path_info dont match :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_param PATH_INFO $fastcgi_script_name;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '    fastcgi_param SCRIPT_NAME "";' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '}' >> $MEDIAGOBLIN_VIRTUAL_HOST
+        echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    else
+        echo -n '' > $MEDIAGOBLIN_VIRTUAL_HOST
+    fi
+    
     echo 'server {' >> $MEDIAGOBLIN_VIRTUAL_HOST
-    echo '  listen 443 ssl;' >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo "  listen 127.0.0.1:${MEDIAGOBLIN_ONION_PORT} default_server;" >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  # Stock useful config options, but ignore them :)' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  #################################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
@@ -9705,7 +9772,6 @@ function install_mediagoblin {
     echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
     nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
-    nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
     nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  # Gzip' >> $MEDIAGOBLIN_VIRTUAL_HOST
@@ -9719,7 +9785,7 @@ function install_mediagoblin {
     echo '  # This is the section you should read' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  #####################################' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
-    echo "  server_name $MEDIAGOBLIN_DOMAIN_NAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
+    echo "  server_name $MEDIAGOBLIN_ONION_HOSTNAME;" >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  access_log /var/log/nginx/mediagoblin.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '  error_log /var/log/nginx/mediagoblin.error.log;' >> $MEDIAGOBLIN_VIRTUAL_HOST
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST