diff --git a/mingw-w64-rubberband/01-mingw-shared.patch b/mingw-w64-rubberband/01-mingw-shared.patch
new file mode 100644
index 0000000000..ae4a3ce4a6
--- /dev/null
+++ b/mingw-w64-rubberband/01-mingw-shared.patch
@@ -0,0 +1,46 @@
+--- rubberband-1.8.1/Makefile.in.orig	2015-05-23 19:57:54.441800000 +0300
++++ rubberband-1.8.1/Makefile.in	2015-05-23 20:06:52.485800000 +0300
+@@ -12,19 +12,22 @@
+ MKDIR			:= mkdir
+ AR			:= ar
+ 
+-DYNAMIC_EXTENSION	:= .so
++LIBRARY_NAME		:= librubberband
++DYNAMIC_EXTENSION	:= .dll
+ DYNAMIC_FULL_VERSION	:= .2.1.0
+-DYNAMIC_ABI_VERSION	:= .2
+-DYNAMIC_LIBNAME		:= librubberband$(DYNAMIC_EXTENSION)
+-DYNAMIC_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,-soname=$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
++DYNAMIC_ABI_VERSION	:= 2
++DYNAMIC_LIBNAME		:= $(LIBRARY_NAME)-${DYNAMIC_ABI_VERSION}$(DYNAMIC_EXTENSION)
++IMP_LIBNAME				:= $(LIBRARY_NAME)$(DYNAMIC_EXTENSION).a
++DYNAMIC_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--out-implib,lib/$(IMP_LIBNAME)
+ VAMP_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--version-script=vamp/vamp-plugin.map
+ LADSPA_LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,--version-script=ladspa/ladspa-plugin.map
+ 
+ PROGRAM_TARGET 		:= bin/rubberband
+ STATIC_TARGET  		:= lib/librubberband.a
+-DYNAMIC_TARGET 		:= lib/$(DYNAMIC_LIBNAME)
+-VAMP_TARGET    		:= lib/vamp-rubberband$(DYNAMIC_EXTENSION)
+-LADSPA_TARGET  		:= lib/ladspa-rubberband$(DYNAMIC_EXTENSION)
++DYNAMIC_TARGET 		:= bin/$(DYNAMIC_LIBNAME)
++IMPL_TARGET    		:= lib/$(IMP_LIBNAME)
++VAMP_TARGET    		:= bin/vamp-rubberband$(DYNAMIC_EXTENSION)
++LADSPA_TARGET  		:= bin/ladspa-rubberband$(DYNAMIC_EXTENSION)
+ 
+ INSTALL_BINDIR		:= @prefix@/bin
+ INSTALL_INCDIR		:= @prefix@/include/rubberband
+@@ -148,11 +151,9 @@
+ 	cp $(PROGRAM_TARGET) $(DESTDIR)$(INSTALL_BINDIR)
+ 	cp $(PUBLIC_INCLUDES) $(DESTDIR)$(INSTALL_INCDIR)
+ 	cp $(STATIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+-	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
++	cp $(IMPL_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)
+ 	rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
+-	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION)
+-	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)$(DYNAMIC_ABI_VERSION)
+-	test -n "$(DYNAMIC_FULL_VERSION)" && ln -s $(DYNAMIC_LIBNAME)$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(DYNAMIC_LIBNAME)
++	cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_BINDIR)/$(DYNAMIC_LIBNAME)
+ 	cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR)
+ 	cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR)
+ 	cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR)
diff --git a/mingw-w64-rubberband/PKGBUILD b/mingw-w64-rubberband/PKGBUILD
index decc0d14ae..848f95ac07 100644
--- a/mingw-w64-rubberband/PKGBUILD
+++ b/mingw-w64-rubberband/PKGBUILD
@@ -15,26 +15,31 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libsndfile"
          "${MINGW_PACKAGE_PREFIX}-fftw"
          "${MINGW_PACKAGE_PREFIX}-ladspa-sdk")
-source=("http://code.breakfastquay.com/attachments/download/34/rubberband-$pkgver.tar.bz2")
-md5sums=('6c2b4e18a714bcc297d0db81a10f9348')
+source=("http://code.breakfastquay.com/attachments/download/34/rubberband-$pkgver.tar.bz2"
+        01-mingw-shared.patch)
+md5sums=('6c2b4e18a714bcc297d0db81a10f9348'
+         'a8afbacb354ee668d1a2aa4035dc0914')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
-  make clean || true
+  patch -p1 -i ${srcdir}/01-mingw-shared.patch
 }
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
+  cp -rf "${_realname}-${pkgver}" "build-${MINGW_CHOST}"
+  cd build-${MINGW_CHOST}
+  
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST}
+
   make
 }
 
 package() {
-  #cd "${srcdir}/build-${MINGW_CHOST}"
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd "${srcdir}/build-${MINGW_CHOST}"
   make DESTDIR="$pkgdir" install
-}
\ No newline at end of file
+}