diff --git a/ftgl.changes b/ftgl.changes
index 7979503..a7101a1 100644
--- a/ftgl.changes
+++ b/ftgl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 21 10:53:30 CEST 2008 - sbrabec@suse.cz
+
+- Added conflict for FTGLDemo moved from -devel to -demo package.
+
 -------------------------------------------------------------------
 Tue Jul 15 18:28:03 CEST 2008 - sbrabec@suse.cz
 
diff --git a/ftgl.spec b/ftgl.spec
index 1344dfd..25fbd10 100644
--- a/ftgl.spec
+++ b/ftgl.spec
@@ -14,12 +14,12 @@
 Name:           ftgl
 BuildRequires:  doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel
 Version:        2.1.2.99.5
-Release:        1
+Release:        2
 %define _version 2.1.3-rc5
 %define __version 2.1.3~rc5
 Url:            http://ftgl.wiki.sourceforge.net/
 Group:          System/Libraries
-License:        LGPL v2.1 or later
+License:        LGPL v2.1 or later; X11/MIT
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 Source:         %{name}-%{_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -176,6 +176,8 @@ License:        LGPL v2.1 or later
 Group:          System/Libraries
 Summary:        Library for Using Arbitrary Fonts in OpenGL Applications
 Requires:       %{name} = %{version}
+# Up to openSUSE 11.0 and SLED 10, %{_bindir}/FTGLDemo was part of ftgl-devel:
+Conflicts:      %{name}-devel <= 2.1.2
 
 %description demo
 FTGL is a free open source library that enables developers to use
@@ -280,6 +282,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/FTGL-simple-demo
 
 %changelog
+* Mon Jul 21 2008 sbrabec@suse.cz
+- Added conflict for FTGLDemo moved from -devel to -demo package.
 * Tue Jul 15 2008 sbrabec@suse.cz
 - Updated to version 2.1.3-rc5:
   * Stable API. Public headers are now frozen.