diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 86a36474470..d8c35175eaf 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,12 +1,9 @@
 COMMENT=	C64 music player and SID chip emulator library
 
-DISTNAME=	libsidplay-1.36.57
-REVISION=	7
+DISTNAME=	libsidplay-1.36.59
 CATEGORIES=	audio
 SHARED_LIBS +=	sidplay              2.0      # .1.3
 
-MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE=	Yes
 
diff --git a/audio/libsidplay/distinfo b/audio/libsidplay/distinfo
index c59205c0a29..e4f08a7f93a 100644
--- a/audio/libsidplay/distinfo
+++ b/audio/libsidplay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libsidplay-1.36.57.tgz) = QpYcJeojNFWJzp5T/iZzN+NhfQUlojzAR/y9MlzM2XA=
-SIZE (libsidplay-1.36.57.tgz) = 242267
+SHA256 (libsidplay-1.36.59.tgz) = PamzjU61v56Ta5YEupLaBZTvOAR9UM+Aao4RxAAAgCQ=
+SIZE (libsidplay-1.36.59.tgz) = 390097
diff --git a/audio/libsidplay/patches/patch-configure b/audio/libsidplay/patches/patch-configure
index 7bc6066554c..96d7bd08a20 100644
--- a/audio/libsidplay/patches/patch-configure
+++ b/audio/libsidplay/patches/patch-configure
@@ -1,14 +1,15 @@
---- configure.orig	Sun Apr 16 10:48:30 2017
-+++ configure	Sun Apr 16 10:48:52 2017
-@@ -1279,8 +1279,9 @@ else
- #line 1280 "configure"
- #include "confdefs.h"
+Index: configure
+--- configure.orig
++++ configure
+@@ -2869,8 +2869,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  
 -#include <iostream.h>
 -#include <fstream.h>
 +#include <iostream>
 +#include <fstream>
 +using namespace std;
-             
- int main() {
  
+ int
+ main ()
diff --git a/audio/libsidplay/patches/patch-src_mytypes_h b/audio/libsidplay/patches/patch-src_mytypes_h
new file mode 100644
index 00000000000..28bae98d6cb
--- /dev/null
+++ b/audio/libsidplay/patches/patch-src_mytypes_h
@@ -0,0 +1,14 @@
+Index: src/mytypes.h
+--- src/mytypes.h.orig
++++ src/mytypes.h
+@@ -31,8 +31,8 @@ typedef signed short int sword;
+ typedef unsigned short int uword;
+ 
+ // Wanted: 32-bit signed/unsigned.
+-typedef signed long int sdword;
+-typedef unsigned long int udword;
++typedef signed int sdword;
++typedef unsigned int udword;
+ 
+ 
+ // Some common type shortcuts.
diff --git a/audio/libsidplay/patches/patch-src_smart_h b/audio/libsidplay/patches/patch-src_smart_h
deleted file mode 100644
index ce5944878f4..00000000000
--- a/audio/libsidplay/patches/patch-src_smart_h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/smart.h.orig	Tue May 11 23:07:35 2010
-+++ src/smart.h	Tue May 11 23:16:56 2010
-@@ -211,16 +211,16 @@ class smartPtr : public smartPtrBase<T>
-     {
-         if ( bufferLen >= 1 )
-         {
--            pBufCurrent = ( bufBegin = buffer );
--            bufEnd = bufBegin + bufferLen;
--            bufLen = bufferLen;
--            status = true;
-+            this->pBufCurrent = ( this->bufBegin = buffer );
-+            this->bufEnd = this->bufBegin + bufferLen;
-+            this->bufLen = bufferLen;
-+            this->status = true;
-         }
-         else
-         {
--            pBufCurrent = bufBegin = bufEnd = 0;
--            bufLen = 0;
--            status = false;
-+            this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
-+            this->bufLen = 0;
-+            this->status = false;
-         }
-     }
- };