diff -Nru hwsd1-1.0.0/Makefile hwsd1-1.0.0/Makefile
--- hwsd1-1.0.0/Makefile	2013-06-12 09:07:26.000000000 +0000
+++ hwsd1-1.0.0/Makefile	2013-06-27 11:26:02.000000000 +0000
@@ -4,27 +4,27 @@
 BUILD ?= Build
 
 all:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-buildonly
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-buildonly
 
 install:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-install
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-install
 
 deps:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-deps
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-deps
 
 package:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-package
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-package
 
 configure:
-	@/usr/bin/cmake /home/eilemann/Software/Buildyard/Build/hwsd
+	@/usr/bin/cmake /home/eilemann/Software/Buildyard-2013.R2/Build/hwsd
 
 test:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-testonly
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-testonly
 
 clean:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd-clean
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd-clean
 
-include /home/eilemann/Software/Buildyard/$(BUILD)/projects.make
+include /home/eilemann/Software/Buildyard-2013.R2/$(BUILD)/projects.make
 
 %:
-	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard hwsd_$@
+	@$(MAKE) --no-print-directory -C /home/eilemann/Software/Buildyard-2013.R2 hwsd_$@
diff -Nru hwsd1-1.0.0/debian/changelog hwsd1-1.0.0/debian/changelog
--- hwsd1-1.0.0/debian/changelog	2013-06-12 09:07:26.000000000 +0000
+++ hwsd1-1.0.0/debian/changelog	2013-06-27 11:26:02.000000000 +0000
@@ -1,5 +1,5 @@
-hwsd1 (1.0.0-4~precise) precise; urgency=low
+hwsd1 (1.0.0-5~precise) precise; urgency=low
 
   * Package built with CMake
 
- -- Stefan Eilemann <eile@eyescale.ch>  Wed, 12 Jun 2013 11:07:26 +0200
+ -- Stefan Eilemann <eile@eyescale.ch>  Thu, 27 Jun 2013 13:26:02 +0200
diff -Nru hwsd1-1.0.0/hwsd/gpu/glx/module.cpp hwsd1-1.0.0/hwsd/gpu/glx/module.cpp
--- hwsd1-1.0.0/hwsd/gpu/glx/module.cpp	2013-06-12 09:07:26.000000000 +0000
+++ hwsd1-1.0.0/hwsd/gpu/glx/module.cpp	2013-06-27 11:26:02.000000000 +0000
@@ -61,15 +61,21 @@
     if( vendor && std::string( vendor ) == "VirtualGL" )
     {
         info.flags |= GPUInfo::FLAG_VIRTUALGL;
-        const char* vglDisplay = getenv( "VGL_DISPLAY" );
-        const std::string vglDisplayStr( vglDisplay ? vglDisplay : ":0.0" );
-        std::stringstream xDisplay;
+        const char* vglDisplayEnv = getenv( "VGL_DISPLAY" );
+        std::string vglDisplay( vglDisplayEnv ? vglDisplayEnv : ":0" );
+        const bool vglHasScreen = vglDisplay[ vglDisplay.size() - 2 ] == '.';
 
+        std::stringstream xDisplay;
         xDisplay << DisplayString( display );
-        if( xDisplay.str() == ":0" )
+        if( xDisplay.str() == ":0" && vglHasScreen )
             xDisplay << "." << DefaultScreen( display );
 
-        if( vglDisplayStr == xDisplay.str( ))
+        const std::string& xDisplayStr = xDisplay.str();
+        const bool xHasScreen = xDisplayStr[ xDisplayStr.size() - 2 ] == '.';
+        if( xHasScreen && !vglHasScreen )
+            vglDisplay += ".0";
+
+        if( vglDisplay == xDisplayStr )
             info.flags |= GPUInfo::FLAG_VIRTUALGL_DISPLAY;
     }