diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86b07bf7c4a154c537bbe035d8c6a97f21cae466..d1cf827e3c71ca38e1e67b7ff882555424b328b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,23 @@ SET( GRIDDIM
 SET( ALUGRID_BASE_PATH
 	"${CMAKE_CURRENT_SOURCE_DIR}/../local" CACHE STRING
 	"ALUGRID_BASE_PATH" )
+
 SET( ALBERTA_GRID_BASE_PATH
-	"${CMAKE_CURRENT_SOURCE_DIR}/../local" CACHE STRING
-	"ALUGRID_BASE_PATH" )
-	
+    "${CMAKE_CURRENT_SOURCE_DIR}/../local" CACHE STRING
+    "ALUGRID_BASE_PATH" )
+
+set( UG_GRID_BASE_PATH
+    "${CMAKE_CURRENT_SOURCE_DIR}/../local" CACHE STRING
+    "UG_GRID_BASE_PATH" )
+
+set( ENABLE_UG OFF )
+if( ${GRIDTYPE} MATCHES "UGGRID" )
+    include_sys_dir( ${UG_GRID_BASE_PATH}/include/ug )
+    link_directories( "${UG_GRID_BASE_PATH}/lib" )
+    set( GRIDLIBS ugS2 ugS3 devS )
+    add_definitions( "-DUGGRID" "-DENABLE_UG=1" )
+endif( ${GRIDTYPE} MATCHES "UGGRID" )
+
 SET( ENABLE_ALUGRID OFF )
 IF( ${GRIDTYPE} MATCHES "ALUGRID" )
 	INCLUDE_SYS_DIR(
@@ -83,7 +96,7 @@ IF( ${GRIDTYPE} MATCHES "ALBERTAGRID" )
 	SET( ENABLE_ALBERTA ON )
 	ADD_DEFINITIONS( -DENABLE_ALBERTA=1 -DDEBUG )
 ENDIF( ${GRIDTYPE} MATCHES "ALBERTAGRID" )
-	
+
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_config.h )
 ADD_DEFINITIONS( ${CUSTOM_FLAGS} )
 
@@ -99,8 +112,6 @@ set( COMMON_LIBS ${DUNE_LIBS} ${BLAS_LIB} "GL" ${PARALIBS} ${CCGNU_LIBRARIES}
 set( COMMON_HEADER ${stuff} ${DUNE_HEADERS} )
 set_source_files_properties( ${COMMON_HEADER} PROPERTIES HEADER_FILE_ONLY 1 )
 
-LINK_DIRECTORIES( "/usr/lib" )
-
 add_subdirectory(dune)
 add_subdirectory(examples)