diff --git a/.gitignore b/.gitignore
index 9edc2e0..3b008c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ocaml-libvirt-0.6.1.0.tar.gz
+/ocaml-libvirt-0.6.1.1.tar.gz
diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec
index cd90612..4840022 100644
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@ -1,12 +1,9 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-
-# Select what subpackages to build.
-%define build_mlvirsh                1
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-libvirt
-Version:        0.6.1.0
-Release:        10%{?dist}
+Version:        0.6.1.1
+Release:        1%{?dist}
 Summary:        OCaml binding for libvirt
 
 Group:          Development/Libraries
@@ -24,9 +21,6 @@ BuildRequires:  libvirt-devel >= 0.2.1
 BuildRequires:  perl
 BuildRequires:  gawk
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
 
 %description
 OCaml binding for libvirt.
@@ -43,24 +37,12 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 
-%if %build_mlvirsh
-%package        -n mlvirsh
-Summary:        OCaml virsh utility
-Group:          Applications/Emulators
-License:        GPLv2+
-
-
-%description    -n mlvirsh
-OCaml virtualization shell.
-%endif
-
-
 %prep
 %setup -q
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --prefix=%{_prefix}
+%configure
 make all doc
 %if %opt
 make opt
@@ -81,10 +63,6 @@ make install-opt
 make install-byte
 %endif
 
-%if !%build_mlvirsh
-rm -f $RPM_BUILD_ROOT%{_bindir}/mlvirsh
-%endif
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,15 +93,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/libvirt/*.mli
 
 
-%if %build_mlvirsh
-%files -n mlvirsh
-%defattr(-,root,root,-)
-%doc COPYING README ChangeLog
-%{_bindir}/mlvirsh
-%endif
-
-
 %changelog
+* Tue Mar  6 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.1-1
+- New upstream version 0.6.1.1.
+- Remove mlvirsh subpackage, no longer upstream.
+- Replace custom configure with RPM macro configure.
+- Use RPM global instead of define.
+- Use built-in RPM OCaml dependency generator.
+
 * Fri Jan 06 2012 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.0-10
 - Rebuild for OCaml 3.12.1.
 
diff --git a/sources b/sources
index 347152c..bde6199 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af774cf259e16ae48c6a203c51ffa231  ocaml-libvirt-0.6.1.0.tar.gz
+07c917a222d346d07907cb2faa5d9b68  ocaml-libvirt-0.6.1.1.tar.gz