diff --git a/configure.ac.in b/configure.ac.in
index 80aa94e5228fb9795c6c314979704ce4ff308d51..9bec5795415295b67d21581f2defa499a973dfc1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -99,6 +99,7 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72])
 dnl
 dnl Sync to vblank support
 dnl
+EPOXY_FOUND="no"
 XDT_CHECK_OPTIONAL_PACKAGE([EPOXY],
                        [epoxy], [libepoxy_minimum_version],
                        [epoxy],
@@ -261,5 +262,6 @@ echo "  XSync support:                $have_xsync"
 echo "  Render support:               $have_render"
 echo "  Xrandr support:               $have_xrandr"
 echo "  Embedded compositor:          $compositor"
+echo "  Epoxy support:                $EPOXY_FOUND"
 echo "  KDE systray protocol proxy:   $kde_systray"
 echo
diff --git a/src/compositor.c b/src/compositor.c
index ef0a88270e6bcd04e8931408dd18d7bb119a4f91..802e7a77f4f3484543bada17ba0d1268a7e0b2b3 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1432,6 +1432,7 @@ vblank_init(ScreenInfo *screen_info)
     return TRUE;
 }
 
+/* Following routine is taken from gdk GL context code by Alexander Larsson */
 static void
 wait_vblank (ScreenInfo *screen_info)
 {
diff --git a/src/main.c b/src/main.c
index c041ade2c11f8909d781b228fabc17642ceee770..5550b371d017c32c418f4fe3a712afd82fd578e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -371,6 +371,15 @@ print_version (void)
     g_print ("No\n");
 #endif
 
+#ifdef HAVE_COMPOSITOR
+    g_print ("\t- Epoxy support:                                ");
+#ifdef HAVE_EPOXY
+    g_print ("Yes\n");
+#else
+    g_print ("No\n");
+#endif /* HAVE_EPOXY */
+#endif /* HAVE_COMPOSITOR */
+
     g_print ("\t- KDE systray proxy (deprecated):               ");
 #ifdef ENABLE_KDE_SYSTRAY_PROXY
     g_print ("Yes\n");