diff --git a/tmva/rmva/CMakeLists.txt b/tmva/rmva/CMakeLists.txt
index 331f383cdfb38e30a02aa94115946278ff3f3bc7..7b83352eb144747befccccbb2e6a924922737027 100644
--- a/tmva/rmva/CMakeLists.txt
+++ b/tmva/rmva/CMakeLists.txt
@@ -1,24 +1,25 @@
 ############################################################################
 # CMakeLists.txt file for building ROOT R package
 ############################################################################
-#Autor: Omar Andres Zapata Mesa 31/05/2013,14/07/2014
-
-set(libname RMVA)
-
-include_directories(${R_INCLUDE_DIRS})
-
-set(R_HEADERS ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/RMethodBase.h 
-              ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodC50.h
-              ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRSNNS.h
-              ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRSVM.h
-              ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRXGB.h
-              )
-
-ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-overloaded-virtual)
 
 ROOT_STANDARD_LIBRARY_PACKAGE(RMVA
-                              HEADERS ${R_HEADERS}
-                              LIBRARIES ${R_LIBRARIES}
-                              DICTIONARY_OPTIONS -I${R_INCLUDE_DIR}
-                              DEPENDENCIES Core Matrix Thread RIO RInterface TMVA)
-target_include_directories(RMVA BEFORE PRIVATE ${R_INCLUDE_DIR})
+  HEADERS
+    TMVA/MethodC50.h
+    TMVA/MethodRSNNS.h
+    TMVA/MethodRSVM.h
+    TMVA/MethodRXGB.h
+    TMVA/RMethodBase.h
+  SOURCES
+    src/MethodC50.cxx
+    src/MethodRSNNS.cxx
+    src/MethodRSVM.cxx
+    src/MethodRXGB.cxx
+    src/RMethodBase.cxx
+  DEPENDENCIES
+    Core
+    Matrix
+    RInterface
+    RIO
+    Thread
+    TMVA
+)