diff -uNr supertuxkart-0.9.orig/cmake/FindAngelscript.cmake supertuxkart-0.9/cmake/FindAngelscript.cmake
--- supertuxkart-0.9.orig/cmake/FindAngelscript.cmake	1970-01-01 03:00:00.000000000 +0300
+++ supertuxkart-0.9/cmake/FindAngelscript.cmake	2015-05-18 17:04:56.631871672 +0300
@@ -0,0 +1,34 @@
+# - Try to find enet
+# Once done this will define
+#
+#  ANGELSCRIPT_FOUND - system has enet
+#  Angelscript_INCLUDE_DIRS - the enet include directory
+#  Angelscript_LIBRARIES - the libraries needed to use enet
+#
+
+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES include
+    )
+
+FIND_LIBRARY(Angelscript_LIBRARY
+    NAMES angelscript
+    PATHS
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+    )
+
+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
+
+IF (ANGELSCRIPT_FOUND)
+    SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
+ENDIF (ANGELSCRIPT_FOUND)
+
+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)
+
diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt
--- supertuxkart-0.9.orig/CMakeLists.txt	2015-05-14 12:28:55.707748866 +0300
+++ supertuxkart-0.9/CMakeLists.txt	2015-05-18 17:04:56.631871672 +0300
@@ -119,10 +119,9 @@
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")   # Enable multi-processor compilation (faster)
 endif()
 
-
-# Build the angelscript library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
-include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
+# Angelscript
+find_package(Angelscript REQUIRED)
+include_directories(${Angelscript_INCLUDE_DIRS})
 
 # OpenAL
 if(APPLE)
@@ -309,7 +308,7 @@
     ${ENet_LIBRARIES}
     glew
     stkirrlicht
-    angelscript
+    ${Angelscript_LIBRARIES}
     ${CURL_LIBRARIES}
     ${OGGVORBIS_LIBRARIES}
     ${OPENAL_LIBRARY}
diff -uNr supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp supertuxkart-0.9/src/scriptengine/scriptarray.cpp
--- supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp	2015-04-21 14:32:22.244216774 +0300
+++ supertuxkart-0.9/src/scriptengine/scriptarray.cpp	2015-05-18 17:06:44.849918355 +0300
@@ -1496,7 +1496,8 @@
 					continue;
 
 				// The parameter must either be a reference to the subtype or a handle to the subtype
-				int paramTypeId = func->GetParamTypeId(0, &flags);
+				int paramTypeId;
+				func->GetParam(0, &paramTypeId, &flags, NULL, NULL);
 
 				if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId &  ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
 					continue;