diff --git a/debian/lenny/applications/kvirc/debian/kvirc-trinity.install b/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/lenny/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/lenny/applications/kvirc/debian/overrides/kvirc b/debian/lenny/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/lenny/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity b/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/lenny/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install b/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/squeeze/applications/kvirc/debian/overrides/kvirc b/debian/squeeze/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/squeeze/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity b/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install b/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
+++ b/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/debian/wheezy/applications/kvirc/debian/overrides/kvirc b/debian/wheezy/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/debian/wheezy/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity b/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/precise/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/precise/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
index 994dd3e0e..01777294f 100644
--- a/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
+++ b/ubuntu/raring/applications/kvirc/debian/kvirc-trinity.install
@@ -1,4 +1,4 @@
-debian/overrides/kvirc usr/share/lintian/overrides
+debian/overrides/kvirc-trinity usr/share/lintian/overrides
 debian/tmp/opt/trinity/bin/kvirc
 debian/tmp/opt/trinity/lib/*.so.*
 debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so
diff --git a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc
deleted file mode 100644
index dc125fd2e..000000000
--- a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc
+++ /dev/null
@@ -1,2 +0,0 @@
-kvirc: binary-without-manpage kvirc
-kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
diff --git a/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity
new file mode 100644
index 000000000..8fc30d2e1
--- /dev/null
+++ b/ubuntu/raring/applications/kvirc/debian/overrides/kvirc-trinity
@@ -0,0 +1,2 @@
+kvirc-trinity: binary-without-manpage kvirc
+kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm