diff --git a/contrib/systemd/gostcoin.service b/contrib/systemd/gostcoin.service
new file mode 100644
index 0000000..6dd90f3
--- /dev/null
+++ b/contrib/systemd/gostcoin.service
@@ -0,0 +1,24 @@
+# It is not recommended to modify this file in-place, because it will
+# be overwritten during package upgrades. If you want to add further
+# options or overwrite existing ones then use
+# $ systemctl edit gostcoin.service
+# See "man systemd.service" for details.
+
+# Note that almost all daemon options could be specified in
+# /etc/gostcoin/gostcoin.conf
+
+[Unit]
+Description=GOSTcoin daemon
+After=network.target
+After=i2pd.service
+
+[Service]
+ExecStart=/usr/sbin/gostcoind -daemon -datadir=/var/lib/gostcoin -conf=/etc/gostcoin/gostcoin.conf -pid=/run/gostcoind/gostcoind.pid
+ExecStop=/usr/sbin/gostcoind -conf=/etc/gostcoin/gostcoin.conf stop
+# Creates /run/gostcoind owned by gostcoin
+RuntimeDirectory=gostcoind
+User=gostcoin
+Type=forking
+PIDFile=/run/gostcoind/gostcoind.pid
+Restart=always
+PrivateTmp=true
diff --git a/contrib/systemd/gostcoin.timer b/contrib/systemd/gostcoin.timer
new file mode 100644
index 0000000..5b2e3da
--- /dev/null
+++ b/contrib/systemd/gostcoin.timer
@@ -0,0 +1,15 @@
+# It is not recommended to modify this file in-place, because it will
+# be overwritten during package upgrades. If you want to add further
+# options or overwrite existing ones then use
+# $ systemctl edit gostcoin.
+# See "man systemd.timer" for details.
+
+[Unit]
+Description=GOSTcoin startup timer
+After=i2pd.service
+
+[Timer]
+OnActiveSec=90
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 0c2c140..3f90f38 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -762,7 +762,7 @@ void StartRPCThreads()
 
     assert(rpc_io_service == NULL);
     rpc_io_service = new asio::io_service();
-    rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
+    rpc_ssl_context = new ssl::context(ssl::context::sslv23);
 
     const bool fUseSSL = GetBoolArg("-rpcssl");
 
@@ -781,7 +781,7 @@ void StartRPCThreads()
         else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
 
         string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
-        SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
+        SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str());
     }
 
     // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
@@ -1064,7 +1064,7 @@ Object CallRPC(const string& strMethod, const Array& params)
     // Connect to localhost
     bool fUseSSL = GetBoolArg("-rpcssl");
     asio::io_service io_service;
-    ssl::context context(io_service, ssl::context::sslv23);
+    ssl::context context(ssl::context::sslv23);
     context.set_options(ssl::context::no_sslv2);
     asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
     SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
diff --git a/src/makefile.unix b/src/makefile.unix
index 5ce2a69..5d5edac 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -9,7 +9,7 @@ USE_DEBUG:=0
 
 LINK:=$(CXX)
 
-DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_NO_CXX11_SCOPED_ENUMS -D_FILE_OFFSET_BITS=64 -DUSE_NATIVE_I2P
+DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_NO_CXX11_SCOPED_ENUMS -DBOOST_ASIO_ENABLE_OLD_SERVICES -D_FILE_OFFSET_BITS=64 -DUSE_NATIVE_I2P
 
 DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(CURDIR)/i2psam $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
 LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 7abd908..6f5aa7d 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -113,7 +113,7 @@ PaymentServer::PaymentServer(QApplication* parent) : QObject(parent), saveURIs(t
 
 bool PaymentServer::eventFilter(QObject *object, QEvent *event)
 {
-    // clicking on bitcoin: URLs creates FileOpen events on the Mac:
+    // clicking on gostcoin: URLs creates FileOpen events on the Mac:
     if (event->type() == QEvent::FileOpen)
     {
         QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);