diff --git a/debian/changelog b/debian/changelog
index 62bd417..f0fabe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frei0r (1.1.22git20090409-2) unstable; urgency=low
+
+  * Conflict with unofficial package frei0r (Closes: #526634).
+
+ -- Luca Bigliardi <shammash@artha.org>  Mon, 01 Jun 2009 11:37:06 +0200
+
 frei0r (1.1.22git20090409-1) unstable; urgency=low
 
   * Sync with upstream git to add pkg-config file.
diff --git a/debian/control b/debian/control
index 66f1125..500fb2e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@
 Section: video
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: frei0r (<= 1.1.22)
+Replaces: frei0r
 Description: minimalistic plugin API for video effects, plugins collection
  frei0r is a minimalistic plugin API for video sources and filters. The
  behavior of the effects can be controlled from the host by simple
@@ -30,6 +32,8 @@
 Section: devel
 Architecture: any
 Depends: ${misc:Depends}
+Conflicts: frei0r-dev (<= 1.1.22)
+Replaces: frei0r-dev
 Description: minimalistic plugin API for video effects, header files
  frei0r is a minimalistic plugin API for video sources and filters. The
  behavior of the effects can be controlled from the host by simple
@@ -47,6 +51,8 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: frei0r-doc (<= 1.1.22)
+Replaces: frei0r-doc
 Description: minimalistic plugin API for video effects, API documentation
  frei0r is a minimalistic plugin API for video sources and filters. The
  behavior of the effects can be controlled from the host by simple