diff --git a/Makefile.common b/Makefile.common
index 4102ee8fd43..cbb80bc63aa 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -71,6 +71,12 @@ fmi: interactive
 fmiclean: 
 	$(MAKE) -C SimulationRuntime/fmi/import/ -f $(defaultMakefileTarget) clean
 
+opencl_rt: 
+	$(MAKE) -C SimulationRuntime/ParModelica/OpenCLRuntime -f $(defaultMakefileTarget)
+	
+opencl_rt_clean: 
+	$(MAKE) -C SimulationRuntime/ParModelica/OpenCLRuntime -f $(defaultMakefileTarget) clean
+        
 breakprocess:
 	(cd testsuite/bootstrapping && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)
 	(cd testsuite/bootstrapping && cp BreakProcess.exe ../../$(builddir_bin)/)
@@ -169,7 +175,7 @@ distclean: clean
 	rm -rf build/
 fmil-clean:
 	rm -rf 3rdParty/FMIL/build 3rdParty/FMIL/install 3rdParty/FMIL/Makefile
-clean: qtclean fmil-clean
+clean: qtclean fmil-clean opencl_rt_clean
 	(cd SimulationRuntime/c && $(MAKE) -f $(defaultMakefileTarget) clean)
 	(cd SimulationRuntime/interactive && $(MAKE) -f $(defaultMakefileTarget) clean)
 	(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) clean)
diff --git a/Makefile.in b/Makefile.in
index 3e1210f6f41..e11e6882e2c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,10 +26,10 @@ settings:
 
 difftool: mkbuilddirs
 	$(MAKE) -C testsuite/difftool
-omc: difftool interactive docs fmi fmil
+omc: difftool interactive docs fmi fmil opencl_rt
 	(cd Compiler && $(MAKE) -f Makefile release)
 
-omcd: difftool interactive docs fmi fmil
+omcd: difftool interactive docs fmi fmil opencl_rt
 	(cd Compiler && $(MAKE) -f Makefile debug)
 
 qtclean-common:
diff --git a/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile b/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile
index 85ab86372c8..8d24bf38939 100644
--- a/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile
+++ b/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile
@@ -8,10 +8,10 @@ AR_=ar -rcs
 COPY=cp -rpu
 CC=g++
 CXX=g++
-EXEEXT=.exe
-DLLEXT=.dll
+EXEEXT=
+DLLEXT=.so
 CFLAGS= -O3 -Wall -I. -I"$(OPENMODELICAHOME)/include/omc"
-OPENLC_LIB= OpenCL.lib 
+OPENLC_LIB= lOpenCL
 
 
 OBJS = \
@@ -27,10 +27,10 @@ transfer: libOMOCLRuntime.a
 	$(COPY) omc_ocl_common_header.h $(OPENMODELICA_INC)
 	$(COPY) omc_ocl_memory_ops.h $(OPENMODELICA_INC)
 	$(COPY) libOMOCLRuntime.a $(OPENMODELICA_LIB)
-	$(COPY) $(OPENLC_LIB) $(OPENMODELICA_LIB)
+#	$(COPY) $(OPENLC_LIB) $(OPENMODELICA_LIB)
 	$(COPY) ParModelicaBuiltin.mo $(OPENMODELICA_LIB)
-	mkdir -p $(OPENMODELICA_INC)/CL/
-	$(COPY) ./CL/* $(OPENMODELICA_INC)/CL/
+#	mkdir -p $(OPENMODELICA_INC)/CL/
+#	$(COPY) ./CL/* $(OPENMODELICA_INC)/CL/
 	$(COPY) OCLRuntimeUtil_new.cl $(OPENMODELICAHOME)/include/omc/
 # cp OCLRuntimeUtil.cl $(OPENMODELICAHOME)/bin/
 # cp ocloffcomp$(EXEEXT) $(OPENMODELICAHOME)/bin/
diff --git a/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.in b/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.in
deleted file mode 100644
index f87f5c14cbb..00000000000
--- a/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-# TODO
\ No newline at end of file