diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt
index 681f4b6f..fbcb8e16 100644
--- a/examples/java/CMakeLists.txt
+++ b/examples/java/CMakeLists.txt
@@ -6,13 +6,15 @@ macro(add_example example_name jar_name)
     set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_name}/upm_${jar_name}.jar")
 
     add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
+    add_dependencies(${example_name} javaupm_${jar_name})
 endmacro()
 
-macro(add_example_with_path example_name jar_path)
+macro(add_example_with_path example_name jar_path jar_name)
     set(example_src "${example_name}.java")
-    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_path}")
+    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_path}/upm_${jar_name}.jar")
 
     add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
+    add_dependencies(${example_name} javaupm_${jar_name})
 endmacro()
 
 add_example(A110X_intrSample a110x)
@@ -119,10 +121,10 @@ if (BACNET_FOUND)
   add_example(E50HX_Example e50hx)
 endif()
 
-add_example_with_path(Jhd1313m1_lcdSample lcd/upm_i2clcd.jar)
-add_example_with_path(Jhd1313m1Sample lcd/upm_i2clcd.jar)
-add_example_with_path(Lcm1602_i2cSample lcd/upm_i2clcd.jar)
-add_example_with_path(Lcm1602_parallelSample lcd/upm_i2clcd.jar)
-add_example_with_path(SSD1308_oledSample lcd/upm_i2clcd.jar)
-add_example_with_path(SSD1327_oledSample lcd/upm_i2clcd.jar)
+add_example_with_path(Jhd1313m1_lcdSample lcd i2clcd)
+add_example_with_path(Jhd1313m1Sample lcd i2clcd)
+add_example_with_path(Lcm1602_i2cSample lcd i2clcd)
+add_example_with_path(Lcm1602_parallelSample lcd i2clcd)
+add_example_with_path(SSD1308_oledSample lcd i2clcd)
+add_example_with_path(SSD1327_oledSample lcd i2clcd)