diff --git a/libmirage.spec b/libmirage.spec
index c5f8046..e1ab9aa 100644
--- a/libmirage.spec
+++ b/libmirage.spec
@@ -17,8 +17,8 @@
 
 
 Name:           libmirage
-%define lname	libmirage7
-%define pname	2_0
+%define lname	libmirage8
+%define pname	2_1
 Summary:        A CD-ROM image access library
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
@@ -60,7 +60,7 @@ file.
 Summary:        A CD-ROM image access library
 Group:          System/Libraries
 # Technically Suggests:, but pretty useless without
-Requires:       libmirage-2_0 >= 2.0
+Requires:       libmirage-%pname >= %version
 
 %description -n %lname
 A CD-ROM image access library part of the cdemu suite.
@@ -69,7 +69,7 @@ libmirage provides uniform access to the data stored in different
 image formats by creating a representation of disc stored in image
 file.
 
-%package 2_0
+%package %pname
 Summary:        CD-ROM image format plugins for libmirage
 Group:          System/Libraries
 %if 0%{?suse_version}
@@ -78,7 +78,7 @@ Recommends:     libmirage-data
 Requires:       libmirage-data
 %endif
 
-%description 2_0
+%description %pname
 A CD-ROM image access library part of the cdemu suite.
 
 libmirage provides uniform access to the data stored in different
@@ -156,20 +156,20 @@ update-mime-database %{_datadir}/mime || :;
 
 %files -n %lname
 %defattr(-,root,root)
-%_libdir/libmirage.so.*
+%_libdir/libmirage.so.8*
 
-%files 2_0
+%files %pname
 %defattr(-,root,root)
-%_libdir/libmirage-2.0
+%_libdir/libmirage-2.1/
 
 %files data
 %defattr(-,root,root)
-%_datadir/gtk-doc
+%_datadir/gtk-doc/
 %_datadir/mime/packages/*
 
 %files devel
 %defattr(-,root,root)
-%_includedir/libmirage
+%_includedir/libmirage/
 %_libdir/libmirage.so
 %_libdir/pkgconfig/libmirage.pc
 %if 0%{?suse_version} != 1210