diff --git a/src/win32/encpem.bat b/src/win32/encpem.bat
index 1d668eadf..19f93b217 100755
--- a/src/win32/encpem.bat
+++ b/src/win32/encpem.bat
@@ -1,3 +1,3 @@
 @title Encrypting server private key
-openssl rsa -in server.key.pem -out server.key.c.pem -des3
-copy server.key.c.pem server.key.pem
\ No newline at end of file
+openssl rsa -in conf/ssl/server.key.pem -out conf/ssl/server.key.c.pem -des3
+copy conf/ssl/server.key.c.pem conf/ssl/server.key.pem
diff --git a/src/win32/makecert.bat b/src/win32/makecert.bat
index 1a449992f..f086959ab 100755
--- a/src/win32/makecert.bat
+++ b/src/win32/makecert.bat
@@ -1,4 +1,4 @@
 @title Certificate Generation
-openssl req -new -config ssl.cnf -out server.req.pem -keyout server.key.pem -nodes
-openssl req -x509 -config ssl.cnf -days 365 -in server.req.pem -key server.key.pem -out server.cert.pem
+openssl req -new -config ssl.cnf -out conf/ssl/server.req.pem -keyout conf/ssl/server.key.pem -nodes
+openssl req -x509 -config ssl.cnf -days 365 -in conf/ssl/server.req.pem -key conf/ssl/server.key.pem -out conf/ssl/server.cert.pem
 
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 50031c6c1..18f0cecd8 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -176,7 +176,7 @@ procedure CurPageChanged(CurPage: Integer);
 begin
   if (CurPage = wpSelectTasks)then
   begin
-     if FileExists(ExpandConstant('{app}\server.cert.pem')) then
+     if FileExists(ExpandConstant('{app}\conf\ssl\server.cert.pem')) then
      begin
         WizardForm.TasksList.Checked[9]:=false;
      end