diff --git a/font-misc-cyrillic.diff b/font-misc-cyrillic.diff
deleted file mode 100644
index 7aedcb0..0000000
--- a/font-misc-cyrillic.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.am.orig	2009-10-08 05:37:22.000000000 +0200
-+++ Makefile.am	2010-04-07 12:36:46.000000000 +0200
-@@ -22,19 +22,12 @@
- FONT_FILES = \
- 	koi12x24b \
- 	koi12x24 \
--	koi5x8 \
- 	koi6x13b \
--	koi6x13 \
--	koi6x9 \
- 	koi7x14b \
--	koi7x14 \
--	koi8x13 \
- 	koi8x16b \
- 	koi8x16 \
- 	koi9x15b \
--	koi9x15 \
--	koi9x18b \
--	koi9x18
-+	koi9x18b
- 
- BDF_FILES = $(FONT_FILES:%=%.bdf)
- PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX))
---- Makefile.in.orig	2009-10-11 03:21:40.000000000 +0200
-+++ Makefile.in	2010-04-07 12:37:27.000000000 +0200
-@@ -232,19 +232,12 @@
- FONT_FILES = \
- 	koi12x24b \
- 	koi12x24 \
--	koi5x8 \
- 	koi6x13b \
--	koi6x13 \
--	koi6x9 \
- 	koi7x14b \
--	koi7x14 \
--	koi8x13 \
- 	koi8x16b \
- 	koi8x16 \
- 	koi9x15b \
--	koi9x15 \
--	koi9x18b \
--	koi9x18
-+	koi9x18b
- 
- BDF_FILES = $(FONT_FILES:%=%.bdf)
- PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX))
diff --git a/font-misc-ethiopic.diff b/font-misc-ethiopic.diff
deleted file mode 100644
index 130ea1f..0000000
--- a/font-misc-ethiopic.diff
+++ /dev/null
@@ -1,133 +0,0 @@
---- Makefile.am.orig	2009-11-30 08:13:29.000000000 +0100
-+++ Makefile.am	2010-10-05 19:56:13.000000000 +0200
-@@ -19,24 +19,17 @@
- #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
--ttffontdir = @TTFFONTDIR@
--ttffont_DATA = GohaTibebZemen.ttf
--
- otffontdir = @OTFFONTDIR@
- otffont_DATA = GohaTibebZemen.otf
- 
- # Used by RUN_FCCACHE
- fontdir = $(ttffontdir) $(otffontdir)
- 
--EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt
-+EXTRA_DIST = $(otffont_DATA) license.txt
- 
- MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
- install-data-hook:
--	@rm -f $(DESTDIR)$(ttffontdir)/fonts.scale
--	$(MKFONTSCALE) $(DESTDIR)$(ttffontdir)
--	@rm -f $(DESTDIR)$(ttffontdir)/font.dir
--	$(MKFONTDIR) $(DESTDIR)$(ttffontdir)
- 	@rm -f $(DESTDIR)$(otffontdir)/fonts.scale
- 	$(MKFONTSCALE) $(DESTDIR)$(otffontdir)
- 	@rm -f $(DESTDIR)$(otffontdir)/font.dir
---- Makefile.in.orig	2010-10-05 09:13:39.000000000 +0200
-+++ Makefile.in	2010-10-05 20:00:50.000000000 +0200
-@@ -97,8 +97,8 @@
- am__base_list = \
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
--am__installdirs = "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)"
--DATA = $(otffont_DATA) $(ttffont_DATA)
-+am__installdirs = "$(DESTDIR)$(otffontdir)"
-+DATA = $(otffont_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -232,14 +232,12 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--ttffontdir = @TTFFONTDIR@
--ttffont_DATA = GohaTibebZemen.ttf
- otffontdir = @OTFFONTDIR@
- otffont_DATA = GohaTibebZemen.otf
- 
- # Used by RUN_FCCACHE
--fontdir = $(ttffontdir) $(otffontdir)
--EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt
-+fontdir = $(otffontdir)
-+EXTRA_DIST = $(otffont_DATA) license.txt
- MAINTAINERCLEANFILES = ChangeLog INSTALL
- all: all-am
- 
-@@ -298,26 +296,7 @@
- 	test -n "$$files" || exit 0; \
- 	echo " ( cd '$(DESTDIR)$(otffontdir)' && rm -f" $$files ")"; \
- 	cd "$(DESTDIR)$(otffontdir)" && rm -f $$files
--install-ttffontDATA: $(ttffont_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(ttffontdir)" || $(MKDIR_P) "$(DESTDIR)$(ttffontdir)"
--	@list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ttffontdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(ttffontdir)" || exit $$?; \
--	done
- 
--uninstall-ttffontDATA:
--	@$(NORMAL_UNINSTALL)
--	@list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \
--	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(ttffontdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(ttffontdir)" && rm -f $$files
- tags: TAGS
- TAGS:
- 
-@@ -470,7 +449,7 @@
- check: check-am
- all-am: Makefile $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)"; do \
-+	for dir in "$(DESTDIR)$(otffontdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
-@@ -520,7 +499,7 @@
- 
- info-am:
- 
--install-data-am: install-otffontDATA install-ttffontDATA
-+install-data-am: install-otffontDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-dvi: install-dvi-am
-@@ -567,7 +546,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-otffontDATA uninstall-ttffontDATA
-+uninstall-am: uninstall-otffontDATA
- 
- .MAKE: install-am install-data-am install-strip
- 
-@@ -580,18 +559,13 @@
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
- 	install-otffontDATA install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip install-ttffontDATA installcheck \
-+	install-ps-am install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
--	pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA \
--	uninstall-ttffontDATA
-+	pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA
- 
- 
- install-data-hook:
--	@rm -f $(DESTDIR)$(ttffontdir)/fonts.scale
--	$(MKFONTSCALE) $(DESTDIR)$(ttffontdir)
--	@rm -f $(DESTDIR)$(ttffontdir)/font.dir
--	$(MKFONTDIR) $(DESTDIR)$(ttffontdir)
- 	@rm -f $(DESTDIR)$(otffontdir)/fonts.scale
- 	$(MKFONTSCALE) $(DESTDIR)$(otffontdir)
- 	@rm -f $(DESTDIR)$(otffontdir)/font.dir
diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes
index c39bf4a..09ab833 100644
--- a/xorg-x11-fonts.changes
+++ b/xorg-x11-fonts.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu May 19 16:01:03 UTC 2011 - eich@novell.com
+
+- Remove patch font-misc-cyrillic.diff
+  Instead specify the fonts to be built and installed explicitely
+  on the command line with "FONT_FILES=<list>".
+
+-------------------------------------------------------------------
+Thu May 19 13:59:02 UTC 2011 - eich@suse.de
+
+- Remove patch font-misc-ethiopic.diff
+  To install only OTF fonts set --with-ttf-fontdir= to an
+  empty string.
+
 -------------------------------------------------------------------
 Tue Dec 21 02:41:21 UTC 2010 - sndirsch@novell.com
 
diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 40c2d22..f2d31a3 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -22,7 +22,7 @@ Name:           xorg-x11-fonts
 BuildRequires:  fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
 Url:            http://xorg.freedesktop.org/
 Version:        7.6
-Release:        8
+Release:        1
 License:        MIT License (or similar)
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -70,8 +70,6 @@ Source34:       font-adobe-utopia-75dpi-1.0.4.tar.bz2
 Source35:       font-adobe-utopia-type1-1.0.4.tar.bz2
 Source36:       font-alias-1.0.3.tar.bz2
 Patch:          encodings.diff
-Patch1:         font-misc-ethiopic.diff
-Patch2:         font-misc-cyrillic.diff
 
 %description
 This package contains fonts maintained and shipped with X.Org.
@@ -99,13 +97,6 @@ for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd encodings-*
 %patch
 popd
-pushd font-misc-ethiopic-*
-%patch1
-popd
-pushd font-misc-cyrillic-*
-%patch2
-rm {koi7x14,koi8x13,koi9x15,koi9x18}.bdf
-popd
 
 %build
 for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
@@ -116,7 +107,7 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
      *100dpi-*)    option="--with-fontdir=/usr/share/fonts/100dpi"         ;;
      *75dpi-*)     option="--with-fontdir=/usr/share/fonts/75dpi"          ;;
      *type1-*)     option="--with-fontdir=/usr/share/fonts/Type1"          ;;
-     *ethiopic-*)  option="--with-ttf-fontdir=/usr/share/fonts/truetype --with-otf-fontdir=/usr/share/fonts/truetype" ;;
+     *ethiopic-*)  option="--with-ttf-fontdir= --with-otf-fontdir=/usr/share/fonts/truetype" ;;
      *meltho-*)    option="--with-fontdir=/usr/share/fonts/truetype"       ;;
      *misc-*)      option="--with-fontdir=/usr/share/fonts/misc"           ;;
      *ttf-*)       option="--with-fontdir=/usr/share/fonts/truetype"       ;;
@@ -133,7 +124,11 @@ done
 
 %install
 for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do
-  make -C $dir install DESTDIR=$RPM_BUILD_ROOT
+    case $dir in
+	*misc-cyrillic-*) option='FONT_FILES=koi12x24b koi12x24 koi6x13b koi7x14b koi8x16b koi8x16 koi9x15b koi9x18b';;
+	*)                option='NOOPT=' ;;
+    esac
+    make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}"
 done
 rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache*
 rm -f $RPM_BUILD_ROOT/usr/share/fonts/75dpi/fonts.{dir,scale}
@@ -199,5 +194,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %config /usr/share/fonts/misc/fonts.dir
 /usr/share/fonts/misc/fonts.alias
 /usr/share/fonts/misc/*.pcf.gz
+%exclude /fonts.dir 
+%exclude /fonts.scale
 
 %changelog