diff --git a/sitegin/config.js b/sitegin/config.js
index ebc1e18aa3958cc4fd14c1c521e9afa1ae1af4ca..9b749c17c21085317986b5c566d8c553be49e432 100644
--- a/sitegin/config.js
+++ b/sitegin/config.js
@@ -9,13 +9,15 @@ var cli = require('cli');
 var options = cli.parse({
  noserver: ['n', 'Dont run server'],
  port: ['p', 'Port on which server should run', 'number', 1337],
- uiport: [null, 'BrowserSync UI port', 'number', 'port+1']
+ uiport: [null, 'BrowserSync UI port', 'number', 'port+1'],
+ httpsonly: [null, 'Converts all http://ok1kvk.cz links to https'],
+ httponly: [null, 'Converts all https://ok1kvk.cz links to http']
 });
 
 module.exports = function() {
   var builddir = 'build';
   if(!options.noserver) builddir = 'build-debug';
-  
+
   if(options.uiport == 'port+1') {
     options.uiport = options.port+1;
   }
diff --git a/sitegin/markdown.js b/sitegin/markdown.js
index 11c1e1996d2bef060796f90243637ea61e19e0b2..041d39d63fe0a877fdb44dac737c7b3052fbbc51 100644
--- a/sitegin/markdown.js
+++ b/sitegin/markdown.js
@@ -30,6 +30,8 @@ renderer.paragraph = function(text) {
   else return '<p>'+text+'</p>\n';
 }
 
+renderer._link = renderer.link;
+
 marked.setOptions({
   renderer: renderer,
   gfm: true,
@@ -42,6 +44,20 @@ marked.setOptions({
 });
 
 module.exports = function(obj) {
+  var options = obj.config.options;
+  renderer.link = function(href, title, text) {
+    if(options.httponly) {
+      if(href.match(/^https:\/\/ok1kvk.cz/))
+        href = href.replace('https://', 'http://');
+    }
+    if(options.httpsonly) {
+      if(href.match(/^http:\/\/ok1kvk.cz/))
+        href = href.replace('http://', 'https://');
+    }
+
+    return renderer._link(href,title,text);
+  };
+
   obj.pages.forEach(function(article) {
     renderer.image = function(href, title, text) {
       href = href.split(path.sep).join('/');
diff --git a/theme/templates/partials/base.html.nunj b/theme/templates/partials/base.html.nunj
index e11671b35b02e41d915195fee40cd06b9b5c71b3..1c4a45c9603ab7aaac4ce8728518bce86a0370b0 100644
--- a/theme/templates/partials/base.html.nunj
+++ b/theme/templates/partials/base.html.nunj
@@ -148,7 +148,7 @@
     <footer class="page-footer blue">
         <div class="container s6">
           <a class="orange-text text-lighten-3" target="_blank" href="https://git.ok1kvk.cz/">Gitlab</a> |
-          <a class="orange-text text-lighten-3" target="_blank" href="https://forum.ok1kvk.cz/">FĂłrum</a> |
+          <a class="orange-text text-lighten-3" target="_blank" href="http://forum.ok1kvk.cz/">FĂłrum</a> |
           <a class="orange-text text-lighten-3" href="/clanek/webkamera/">Webkamera</a> |
           <a class="orange-text text-lighten-3" href="/clanek/jak-nahlasit-chybu/">Jak nahlásit chybu</a>
           {% block footerlink %}
diff --git a/upload b/upload
index c047766bd768fec9c5fb1c3f6d8c11550394955f..2e15a9df9d757e362de923734027118eb54ad95e 100755
--- a/upload
+++ b/upload
@@ -12,4 +12,4 @@ echo "Site compiled"
 chmod a+X build -R
 
 echo "Uploading to nove.ok1kvk.cz"
-lftp -c "set ftp:ssl-allow no; open --user ok1kvk.cz-nove --env-password ftp://ok1kvk.cz/; mirror -c --verbose=9 -e -R -L ./build /"
+lftp -c "set ftp:ssl-allow no; open --user ok1kvk.cz-www-nove --env-password ftp://ok1kvk.cz/; mirror -c --verbose=9 -e -R -L ./build /"