diff --git a/bitstream-vera.changes b/bitstream-vera-fonts.changes
similarity index 85%
rename from bitstream-vera.changes
rename to bitstream-vera-fonts.changes
index 283d9bd..e97ec40 100644
--- a/bitstream-vera.changes
+++ b/bitstream-vera-fonts.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Dec 21 14:38:27 UTC 2011 - toms@suse.de
+
+- Renamed bitstream-vera -> bitstream-vera-fonts according to
+  openSUSE packaging guidelines and FATE#313035
+  Adjusted Obsoletes and Provides accordingly
+
+
 -------------------------------------------------------------------
 Sat Sep 17 19:53:05 UTC 2011 - jengelh@medozas.de
 
diff --git a/bitstream-vera.spec b/bitstream-vera-fonts.spec
similarity index 74%
rename from bitstream-vera.spec
rename to bitstream-vera-fonts.spec
index 35e3876..6f7bb48 100644
--- a/bitstream-vera.spec
+++ b/bitstream-vera-fonts.spec
@@ -15,32 +15,36 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define fontname     bitstream-vera
+%define ttf_fontdir  /usr/share/fonts/truetype
 
-
-Name:           bitstream-vera
+Name:           bitstream-vera-fonts
 License:        Redistributable. Change name upon modification
 Group:          System/X11/Fonts
 PreReq:         %suseconfig_fonts_prereq
 Version:        1.10
 Release:        304
 Summary:        Bitstream Vera(tm) Truetype fonts
-Source:         ttf-%name-%version.tar.bz2
+Source:         ttf-%{fontname}-%{version}.tar.bz2
 Url:            http://www.bitstream.com
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+# FIXME: This causes a rpmlint warning; change <= to < once there's a new upstream version
+Obsoletes:      %{fontname} <= 1.10
+Provides:       %{fontname} = %{version}
+
 
 %description
 The package contains the "Vera" truetype fonts from Bitstream Inc.
 
 %prep
-%setup -n ttf-%name-%version
+%setup -n ttf-%{fontname}-%{version}
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/share/fonts/truetype/
-install -m 0644 *.ttf \
-        $RPM_BUILD_ROOT/usr/share/fonts/truetype/
+mkdir -p $RPM_BUILD_ROOT%{ttf_fontdir}
+install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttf_fontdir}
 
 %post
 %run_suseconfig_fonts