diff --git a/mingw-sqlite.spec b/mingw-sqlite.spec
index 6595f43..b5aae51 100644
--- a/mingw-sqlite.spec
+++ b/mingw-sqlite.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 %global name1 sqlite
 
@@ -97,7 +97,7 @@ are named to permit each to be installed on a single host
 This package contains static cross-compiled library
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -122,9 +122,9 @@ libtoolize --force
 #   - RWMJ 2008-09-30
 export config_TARGET_EXEEXT=.exe
 # add compile flags to enable rtree, fts3
-export MINGW32_CFLAGS="%{_mingw32_cflags} -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
+export MINGW32_CFLAGS="%{mingw32_cflags} -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
 
-%{_mingw32_configure} %{!?with_tcl:--disable-tcl} \
+%{mingw32_configure} %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks \
            --enable-load-extension
@@ -140,38 +140,39 @@ make
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-chmod 0644 $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.dll.a
+chmod 0644 $RPM_BUILD_ROOT%{mingw32_libdir}/libsqlite3.dll.a
 
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libsqlite3-0.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
 
 %if %{with tcl}
-install -d -m755 $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/
-mv $RPM_BUILD_ROOT%{_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/
+install -d -m755 $RPM_BUILD_ROOT%{mingw32_datadir}/tcl%{tclversion}/sqlite3/
+mv $RPM_BUILD_ROOT%{_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl $RPM_BUILD_ROOT%{mingw32_datadir}/tcl%{tclversion}/sqlite3/
 %endif
 
 
 %files -n mingw32-%{name1}
 %doc README VERSION
-%{_mingw32_bindir}/sqlite3.exe
-%{_mingw32_bindir}/libsqlite3-0.dll
-#%{_mingw32_bindir}/libsqlite3-0.dll.debug
-%{_mingw32_libdir}/libsqlite3.dll.a
-%{_mingw32_libdir}/libsqlite3.la
-%{_mingw32_includedir}/sqlite3.h
-%{_mingw32_includedir}/sqlite3ext.h
-%{_mingw32_libdir}/pkgconfig/sqlite3.pc
+%{mingw32_bindir}/sqlite3.exe
+%{mingw32_bindir}/libsqlite3-0.dll
+#%{mingw32_bindir}/libsqlite3-0.dll.debug
+%{mingw32_libdir}/libsqlite3.dll.a
+%{mingw32_libdir}/libsqlite3.la
+%{mingw32_includedir}/sqlite3.h
+%{mingw32_includedir}/sqlite3ext.h
+%{mingw32_libdir}/pkgconfig/sqlite3.pc
 %if %{with tcl}
-%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/
-%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl
+%{mingw32_datadir}/tcl%{tclversion}/sqlite3/
+%{mingw32_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl
 %endif
 
 %files -n mingw32-%{name1}-static
-%{_mingw32_libdir}/libsqlite3.a
+%{mingw32_libdir}/libsqlite3.a
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember@gmail.com> - 3.7.9-3
 - Renamed the source package to mingw-sqlite (#800450)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 3.7.9-2
 - Rebuild against the mingw-w64 toolchain