diff --git a/demo/viewer/main.cpp b/demo/viewer/main.cpp
index f90bd877c..fa99624a6 100644
--- a/demo/viewer/main.cpp
+++ b/demo/viewer/main.cpp
@@ -39,10 +39,10 @@ int main( int argc, char **argv )
 	using mapnik::freetype_engine;
 	
 	// modify this prefix based on your install location
-	std::string mapnik_dir = "/opt/mapnik2";
+	std::string mapnik_dir = "/opt/mapnik";
 	
-	datasource_cache::instance()->register_datasources(mapnik_dir + "/lib/mapnik/input");
-	boost::filesystem::path path(mapnik_dir + "/lib/mapnik/fonts");
+	datasource_cache::instance()->register_datasources(mapnik_dir + "/lib/mapnik2/input");
+	boost::filesystem::path path(mapnik_dir + "/lib/mapnik2/fonts");
 	boost::filesystem::directory_iterator end_itr;	
     
     
diff --git a/demo/viewer/viewer.pro b/demo/viewer/viewer.pro
index 23c3139ae..d10a7ab1e 100644
--- a/demo/viewer/viewer.pro
+++ b/demo/viewer/viewer.pro
@@ -4,14 +4,14 @@
 CC = g++
 TEMPLATE = app
 
-INCLUDEPATH += /opt/mapnik2/include
+INCLUDEPATH += /opt/mapnik/include
 INCLUDEPATH += /opt/boost/include/
 INCLUDEPATH += /usr/X11/include/
 INCLUDEPATH += /usr/X11/include/freetype2
 INCLUDEPATH += .
 
 QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers'
-unix:LIBS =  -L/opt/mapnik2/lib -L/usr/X11/lib -lmapnik -lfreetype -L/usr/local/lib -licuuc
+unix:LIBS =  -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik2 -lfreetype -L/usr/local/lib -licuuc
 unix:LIBS += -lboost_system -lboost_filesystem -lboost_regex -L/opt/boost/lib
 
 # Input