diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23cfdde..5aed845 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
 # CUDA might not be part of CMake 2.6, either install 2.8 or install the CUDA modules yourself.
 FIND_PACKAGE(Qt4 REQUIRED)
 FIND_PACKAGE(CUDA REQUIRED)
+FIND_PACKAGE(OpenGL REQUIRED)
+
+# Necessary on Ubuntu 11.10 if we specify the compiler with 
+# "CXX=g++-4.4 CC=gcc-4.4 cmake" 
+SET(CUDA_NVCC_FLAGS "-ccbin;${CMAKE_CXX_COMPILER}")
 
 install(FILES README.md LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME}/)
 
 # This is where the source code is.
 SUBDIRS(src)
- 
\ No newline at end of file
+ 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f1c188..fc7aeef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,6 @@ ELSEIF(WIN32)
   CUDA_ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} WIN32 ${cuda_qt_framework_CUDA_SRCS} ${cuda_qt_framework_SRCS_CXX})
 ENDIF()
 
-TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${QT_LIBRARIES} ${OPENGL_LIBRARIES})
 
 INSTALL(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION bin)