diff --git a/.gitignore b/.gitignore
index 2bed6e7..d92c140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
+*.rpm
+results_mingw-dlfcn
+noarch
+
+dlfcn-win32-*
 dlfcn-win32-r11.tar.bz2
+/v1.1.1.tar.gz
diff --git a/mingw-dlfcn.spec b/mingw-dlfcn.spec
index c783962..9741539 100644
--- a/mingw-dlfcn.spec
+++ b/mingw-dlfcn.spec
@@ -2,17 +2,15 @@
 
 %global realname dlfcn-win32
 
-%global alphatag r11
-
 Name:          mingw-dlfcn
-Version:       0
-Release:       0.20.%{alphatag}%{?dist}
+Version:       1.1.1
+Release:       1%{?dist}
 Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 
 License:       LGPLv2+
 Group:         Development/Libraries
-URL:           http://code.google.com/p/dlfcn-win32/
-Source0:       http://dlfcn-win32.googlecode.com/files/%{realname}-%{alphatag}.tar.bz2
+URL:           https://github.com/%{realname}/%{realname}
+Source0:       https://github.com/%{realname}/%{realname}/archive/v%{version}.tar.gz
 
 BuildArch:     noarch
 
@@ -24,11 +22,7 @@ BuildRequires: mingw64-filesystem >= 95
 BuildRequires: mingw64-gcc
 BuildRequires: mingw64-binutils
 
-#BuildRequires: dos2unix
-
-Patch1:        dlfcn_configure.patch
-Patch2:        dlfcn-fix-cplusplus-linkage.patch
-Patch3:        dlfcn-fix-static-lib.patch
+BuildRequires: cmake
 
 
 %description
@@ -73,60 +67,71 @@ Static version of the MinGW Windows dlfcn library.
 
 
 %prep
-%setup -q -n %{realname}-%{alphatag}
-
-%{__sed} -i 's/\r//' configure
-%{__sed} -i 's/\r//' README
-%{__sed} -i 's/\r//' COPYING
+%setup -q -n %{realname}-%{version}
 
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
+for f in README.md COPYING; do
+    %{__sed} -i 's/\r//' "${f}";
+done
 
 
 %build
-export MINGW32_CONFIGURE_ARGS="--incdir=%{mingw32_includedir} --cc=%{mingw32_cc} --enable-strip=%{mingw32_strip}"
-export MINGW64_CONFIGURE_ARGS="--incdir=%{mingw64_includedir} --cc=%{mingw64_cc} --enable-strip=%{mingw64_strip}"
-%mingw_configure --enable-shared --enable-static
-
-# This package doesn't support out of source compilation by default
-# Fix this manually
-sed -i s@'dlfcn.c'@'../dlfcn.c'@ Makefile
-sed -i s@'dlfcn.h'@'../dlfcn.h'@ Makefile
-sed -i s@'test.c'@'../test.c'@ Makefile
-sed -i s@'testdll.c'@'../testdll.c'@ Makefile
-cp Makefile build_win32
-cp Makefile build_win64
+%mingw_cmake
 
 %mingw_make %{?_smp_mflags}
 
+# Build static win32 lib
+mkdir -p build_win32_static
+pushd build_win32_static
+%mingw32_cmake -DBUILD_SHARED_LIBS:BOOL=OFF
+popd
+# Build static win64 lib
+mkdir -p build_win64_static
+pushd build_win64_static
+%mingw64_cmake -DBUILD_SHARED_LIBS:BOOL=OFF
+popd
+
 
 %install
 %mingw_make DESTDIR=$RPM_BUILD_ROOT install
+# Install static win32 lib
+pushd build_win32_static
+%mingw32_make DESTDIR=$RPM_BUILD_ROOT install
+popd
+# Install static win64 lib
+pushd build_win64_static
+%mingw64_make DESTDIR=$RPM_BUILD_ROOT install
+popd
 
 
 # Win32
 %files -n mingw32-dlfcn
-%doc README COPYING
+%doc README.md COPYING
 %{mingw32_bindir}/libdl.dll
 %{mingw32_libdir}/libdl.dll.a
 %{mingw32_includedir}/dlfcn.h
+%{mingw32_datadir}/%{realname}
 
 %files -n mingw32-dlfcn-static
 %{mingw32_libdir}/libdl.a
 
 # Win64
 %files -n mingw64-dlfcn
-%doc README COPYING
+%doc README.md COPYING
 %{mingw64_bindir}/libdl.dll
 %{mingw64_libdir}/libdl.dll.a
 %{mingw64_includedir}/dlfcn.h
+%{mingw64_datadir}/%{realname}
 
 %files -n mingw64-dlfcn-static
 %{mingw64_libdir}/libdl.a
 
 
 %changelog
+* Tue Jun 13 2017 Greg Hellings <greg.hellings@gmail.com> - 1.1.1-1
+- Upstrema version moved to Github
+- New upstream release 1.1.1
+- Use CMake
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.20.r11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 547b454..005eb2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-728d2c79edaf09ee3c309860499502eb  dlfcn-win32-r11.tar.bz2
+SHA512 (v1.1.1.tar.gz) = 557729511546f574487f8c7de437c53bcf5ae11640349c338ead9965a4ac0f937de647839b63c821003be54dca5bcbf28f2899d2348acf7dfef31e487da1cba1