diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am
index c1f89df..a22d77f 100644
--- a/libvncserver/Makefile.am
+++ b/libvncserver/Makefile.am
@@ -59,6 +59,7 @@ LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \
 	$(ZLIBSRCS) $(TIGHTSRCS) $(TIGHTVNCFILETRANSFERSRCS)
 
 libvncserver_la_SOURCES=$(LIB_SRCS)
+libvncserver_la_LIBADD=@SSL_LIBS@ @CRYPT_LIBS@
 
 lib_LTLIBRARIES=libvncserver.la
 
diff --git a/libvncserver/cargs.c b/libvncserver/cargs.c
index 332ffa1..2e973e8 100644
--- a/libvncserver/cargs.c
+++ b/libvncserver/cargs.c
@@ -163,6 +163,20 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
             if (! rfbStringToAddr(argv[++i], &(rfbScreen->listenInterface))) {
                 return FALSE;
             }
+#ifdef LIBVNCSERVER_WITH_WEBSOCKETS
+        } else if (strcmp(argv[i], "-sslkeyfile") == 0) {  /* -sslkeyfile sslkeyfile */
+            if (i + 1 >= *argc) {
+		rfbUsage();
+		return FALSE;
+	    }
+            rfbScreen->sslkeyfile = argv[++i];
+        } else if (strcmp(argv[i], "-sslcertfile") == 0) {  /* -sslcertfile sslcertfile */
+            if (i + 1 >= *argc) {
+		rfbUsage();
+		return FALSE;
+	    }
+            rfbScreen->sslcertfile = argv[++i];
+#endif
         } else {
 	    rfbProtocolExtension* extension;
 	    int handled=0;