diff --git a/conf/noarch/entropy/packages/packages.server.dep_rewrite b/conf/noarch/entropy/packages/packages.server.dep_rewrite
index db89e6d..14e4313 100644
--- a/conf/noarch/entropy/packages/packages.server.dep_rewrite
+++ b/conf/noarch/entropy/packages/packages.server.dep_rewrite
@@ -224,6 +224,6 @@ virtual/ffmpeg (.*)media-video/ffmpeg(.*) \1media-video/libav\2
 # this might not catch all the strings
 * (.*)dev-python/pygobject(.*)\[cairo\] \1dev-python/pygobject-cairo\2
 # Rewrite almost every standard dev-python/pygobject dependency
-* (.*)dev-python/pygobject(?=-[0-9]\.)(?!.*\[.*cairo.*\].*)((.*:3)?) \1dev-python/pygobject-base\2
+* (.*)dev-python/pygobject((?=-[0-9]\.)?)(?!.*\[.*cairo.*\].*)((.*:3)?) \1dev-python/pygobject-base\2
 # This handles the case where USE=cairo is specified
-* (.*)dev-python/pygobject(?=-[0-9]\.)(?=.*\[.*cairo.*\].*)((.*:3)?) \1dev-python/pygobject-base\2 \1dev-python/pygobject-cairo\2
+* (.*)dev-python/pygobject((?=-[0-9]\.)?)(?=.*\[.*cairo.*\].*)((.*:3)?) \1dev-python/pygobject-base\2 \1dev-python/pygobject-cairo\2