diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 7e01e645c..3d69288b0 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -1,8 +1,14 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 #AM_CPPFLAGS = -fno-rtti
 
-svn_version.h: 
-	sleep 30 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h
+BUILT_SOURCES  = svn_version.h
+
+svn_version.h:
+	@if test -d .svn ; then \
+		sleep 180 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h ; \
+	else \
+		sleep 180 && rm svn_version.h & echo '#define BUILT_DATE "'`date`'"' > svn_version.h ; \
+	fi
 
 noinst_HEADERS = svn_version.h
 
@@ -25,14 +31,14 @@ INCLUDES = \
 noinst_LIBRARIES = libtimerlist.a libneutrino_gui.a libneutrino_gui2.a
 
 libneutrino_gui_a_SOURCES = \
-	bouquetlist.cpp channellist.cpp eventlist.cpp pluginlist.cpp \
+	imageinfo.cpp bouquetlist.cpp channellist.cpp eventlist.cpp pluginlist.cpp \
 	favorites.cpp sleeptimer.cpp screensetup.cpp \
 	epgview.cpp infoviewer.cpp scan.cpp update.cpp \
 	filebrowser.cpp audioplayer.cpp nfs.cpp pictureviewer.cpp \
 	movieplayer.cpp rc_lock.cpp bookmarkmanager.cpp \
 	timeosd.cpp epgplus.cpp epg_menu.cpp \
 	streaminfo2.cpp dboxinfo.cpp \
-	plugins.cpp imageinfo.cpp audio_select.cpp moviebrowser.cpp movieinfo.cpp
+	plugins.cpp audio_select.cpp moviebrowser.cpp movieinfo.cpp
 
 libneutrino_gui2_a_SOURCES = \
 	color.cpp alphasetup.cpp motorcontrol.cpp hdd_menu.cpp cam_menu.cpp infoclock.cpp upnpbrowser.cpp
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index ab83bc450..4c6e495cf 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -39,6 +39,7 @@
 
 #include "svn_version.h"
 #define SVN_REV "SVN Rev.:"
+#define GIT_REV "GIT Build:"
 extern cVideo * videoDecoder;
 
 extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -89,7 +90,11 @@ void CImageInfo::Init(void)
 			offset = tmpoffset;
 		}
 	}
+#ifdef SVNVERSION
 	int off_tmp = g_Font[font_info]->getRenderWidth(SVN_REV);
+#else
+	int off_tmp = g_Font[font_info]->getRenderWidth(GIT_REV);
+#endif
 	if(off_tmp > offset)
 		offset  = off_tmp;
 
@@ -207,9 +212,13 @@ void CImageInfo::paint()
 	paintLine(xpos+offset, font_info, releaseCycle);
 
 	ypos += iheight;
+#ifdef SVNVERSION
 	paintLine(xpos    , font_info, SVN_REV);
 	paintLine(xpos+offset, font_info, SVNVERSION );
-
+#else
+	paintLine(xpos    , font_info, GIT_REV);
+	paintLine(xpos+offset, font_info, BUILT_DATE );
+#endif
 	ypos += iheight;
 	paintLine(xpos    , font_info, g_Locale->getText(LOCALE_IMAGEINFO_CREATOR));
 	paintLine(xpos+offset, font_info, creator);