diff --git a/make/java.mk b/make/java.mk
new file mode 100644
index 00000000..499d6101
--- /dev/null
+++ b/make/java.mk
@@ -0,0 +1,15 @@
+JAVA_SRC_DIR            ?= .
+JAVA_SRC                ?= $(wildcard $(JAVA_SRC_DIR)/*.java)
+JAVA_CLASSFILES         += $(patsubst %.java,%.class,$(JAVA_SRC))
+JAVA_CLASSPATH           = $(shell echo $(CLASSPATH) | sed 's/  */:/g')
+
+include $(MODDIR)/make/defs.mk
+
+all: $(JAVA_CLASSFILES)
+clean: clean.java
+
+clean.java:
+	rm -f *.class
+
+$(JAVA_CLASSFILES): $(JAVA_SRC)
+	CLASSPATH=$(JAVA_CLASSPATH) javac $^
diff --git a/make/test-java.mk b/make/test-java.mk
new file mode 100644
index 00000000..ee7eb010
--- /dev/null
+++ b/make/test-java.mk
@@ -0,0 +1,13 @@
+all:
+install:
+clean:
+distclean:
+
+JAVA_TEST_MAIN_JAVA        = $(JAVA_SRC_DIR)/$(JAVA_TEST_MAIN_CLASS).java
+#JAVA_TEST_MAIN_CLASSFILE   = $(JAVA_SRC_DIR)/$(JAVA_TEST_MAIN_CLASS).class
+JAVA_SRC                  += $(JAVA_TEST_MAIN_JAVA)
+
+#include $(MODDIR)/make/java.mk
+
+run test: $(JAVA_CLASSFILES)
+	CLASSPATH=$(shell echo $(CLASSPATH) | sed 's/  */:/g') java $(JAVA_TEST_MAIN_CLASS) $(EXE_ARGS)