diff --git a/Makefile b/Makefile
index 05e8dca..bff7daf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@ CC?=gcc
 CFLAGS+=-I../libowfat -Wall -pipe -O2
 LDFLAGS+=-L../libowfat/ -lowfat -s -lm
 
+HEADERS=trackerlogic.h scan_urlencoded_query.h
 SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c
 
-opentracker: $(SOURCES)
+opentracker: $(SOURCES) $(HEADERS)
 	$(CC) $(SOURCES) -o opentracker $(CFLAGS) $(LDFLAGS)
 
 clean:
diff --git a/trackerlogic.h b/trackerlogic.h
index d2948db..a5dce7c 100644
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -46,7 +46,7 @@ static const ot_byte PEER_FLAG_COMPLETED = 0x40;
 static const ot_byte PEER_FLAG_STOPPED   = 0x20;
 
 #define OT_SETIP( peer, ip ) MEMMOVE((peer),(ip),4);
-#define OT_SETPORT( peer, port ) MEMMOVE(((ot_byte*)peer)+6,(port),2);
+#define OT_SETPORT( peer, port ) MEMMOVE(((ot_byte*)peer)+4,(port),2);
 #define OT_FLAG(peer) (((ot_byte*)(peer))[6])
 
 typedef struct {