diff --git a/Makefile b/Makefile
index 8c2a2d0bd..ccd1f2f97 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,19 @@ else
 endif
 
 ifeq ($(LANGUAGE),go)
-SUFFIX:= pb.go
+SUFFIX:= .pb.go
 endif
 ifeq ($(LANGUAGE),cpp)
-SUFFIX:= pb.cc
+SUFFIX:= .pb.cc
+endif
+ifeq ($(LANGUAGE),py)
+SUFFIX:= _pb2.py
+endif
+ifeq ($(LANGUAGE),java)
+SUFFIX:= .java
 endif
 
-DEPS:= $(shell find . -type f -name '*.proto' | sed "s/proto$$/$(SUFFIX)/")
+DEPS:= $(shell find . -type f -name '*.proto' | sed "s/\.proto$$/$(SUFFIX)/")
 
 all: supported_lang $(DEPS)
 
@@ -42,7 +48,7 @@ ifndef SUFFIX
 	$(error unsupported language: [$(LANGUAGE)])
 endif
 
-%.$(SUFFIX):  %.proto
+%$(SUFFIX):  %.proto
 	mkdir -p $(OUTPUT)
 	protoc $(FLAGS) $(dir $<)*.proto