diff --git a/.gitignore b/.gitignore
index 2cb9ea10..0e609a70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # i2pd
-*.o
+obj/*.o
 router.info
 router.keys
 i2p
diff --git a/Makefile b/Makefile
index abe4238d..5a3e6336 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,28 @@
 
 CC = g++
 CFLAGS = -g -Wall -std=c++0x
-OBJECTS = i2p.o base64.o NTCPSession.o RouterInfo.o Transports.o RouterContext.o \
-	NetDb.o LeaseSet.o Tunnel.o TunnelEndpoint.o TunnelGateway.o TransitTunnel.o \
-	I2NPProtocol.o Log.o Garlic.o HTTPServer.o Streaming.o Identity.o SSU.o util.o
+OBJECTS = obj/i2p.o obj/base64.o obj/NTCPSession.o obj/RouterInfo.o obj/Transports.o \
+	obj/RouterContext.o obj/NetDb.o obj/LeaseSet.o obj/Tunnel.o obj/TunnelEndpoint.o \
+    obj/TunnelGateway.o obj/TransitTunnel.o obj/I2NPProtocol.o obj/Log.o obj/Garlic.o \
+    obj/HTTPServer.o obj/Streaming.o obj/Identity.o obj/SSU.o obj/util.o
 INCFLAGS = 
 LDFLAGS = -Wl,-rpath,/usr/local/lib -lcryptopp -lboost_system -lboost_filesystem -lpthread
 LIBS = 
 
 all: i2p
 
-i2p: $(OBJECTS)
-	$(CC) -o i2p $(OBJECTS) $(LDFLAGS) $(LIBS)
+i2p: $(OBJECTS:obj/%=obj/%)
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
 .SUFFIXES:
 .SUFFIXES:	.c .cc .C .cpp .o
 
-.cpp.o :
-	$(CC) -o $@ -c $(CFLAGS) $< $(INCFLAGS)
+obj/%.o : %.cpp
+	mkdir -p obj
+	$(CC) -o $@ $< -c $(CFLAGS) $(INCFLAGS)
 
 clean:
-	rm -f *.o
+	rm -fr obj
 
 .PHONY: all
 .PHONY: clean