diff --git a/wmitime/Makefile b/wmitime/Makefile
new file mode 100644
index 0000000..c928067
--- /dev/null
+++ b/wmitime/Makefile
@@ -0,0 +1,30 @@
+#LANG = fr
+LIBS   = -lXpm -lXext -lX11 -lm
+CFLAGS = -O2 -Wall
+OBJS =	wmitime.o \
+		wmgeneral/wmgeneral.o \
+		wmgeneral/misc.o \
+		wmgeneral/list.o
+INSTALL = install
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -D$(LANG) -c $< -o $*.o
+
+wmitime: $(OBJS)
+	$(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
+
+all:: wmtime
+
+clean::
+	for i in $(OBJS) ; do \
+		rm -f $$i ; \
+	done
+	rm -f wmitime
+	rm -f *~
+
+install:: wmitime
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) wmitime $(DESTDIR)$(BINDIR)
+	@echo "wmitime Installation finished..."
diff --git a/wmitime/README b/wmitime/README
index 1b8caf2..c26ffa8 100644
--- a/wmitime/README
+++ b/wmitime/README
@@ -20,7 +20,6 @@ Let me know what you think of it. ;)
 
 Installing
 --------------------------------------------------------------
-cd wmitime
 make
 make install
 
diff --git a/wmitime/wmitime/french.h b/wmitime/french.h
similarity index 100%
rename from wmitime/wmitime/french.h
rename to wmitime/french.h
diff --git a/wmitime/wmitime/language.h b/wmitime/language.h
similarity index 100%
rename from wmitime/wmitime/language.h
rename to wmitime/language.h
diff --git a/wmitime/wmitime/wmitime-master-led.xpm b/wmitime/wmitime-master-led.xpm
similarity index 100%
rename from wmitime/wmitime/wmitime-master-led.xpm
rename to wmitime/wmitime-master-led.xpm
diff --git a/wmitime/wmitime/wmitime-master.xpm b/wmitime/wmitime-master.xpm
similarity index 100%
rename from wmitime/wmitime/wmitime-master.xpm
rename to wmitime/wmitime-master.xpm
diff --git a/wmitime/wmitime/wmitime.c b/wmitime/wmitime.c
similarity index 99%
rename from wmitime/wmitime/wmitime.c
rename to wmitime/wmitime.c
index c4b87f3..e72d16a 100644
--- a/wmitime/wmitime/wmitime.c
+++ b/wmitime/wmitime.c
@@ -28,8 +28,8 @@
 #include <X11/xpm.h>
 #include <X11/extensions/shape.h>
 
-#include "../wmgeneral/wmgeneral.h"
-#include "../wmgeneral/misc.h"
+#include "wmgeneral/wmgeneral.h"
+#include "wmgeneral/misc.h"
 
 #ifdef fr_FR
 #define fr
diff --git a/wmitime/wmitime/Makefile b/wmitime/wmitime/Makefile
deleted file mode 100644
index 1b1185d..0000000
--- a/wmitime/wmitime/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#LANG = fr
-LIBDIR = -L/usr/X11R6/lib
-LIBS   = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
-OBJS =	wmitime.o \
-		../wmgeneral/wmgeneral.o \
-		../wmgeneral/misc.o \
-		../wmgeneral/list.o
-
-
-.c.o:
-	cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-
-wmtime: $(OBJS)
-	cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-
-all:: wmtime
-
-clean::
-	for i in $(OBJS) ; do \
-		rm -f $$i ; \
-	done
-	rm -f wmitime
-	rm -f *~
-
-install:: wmitime
-	cp -f wmitime /usr/local/bin/
-	chmod 755 /usr/local/bin/wmitime
-	chown root:root /usr/local/bin/wmitime
-#	cp wminetrc $(HOME)/.wminetrc
-#	chmod 600 $(HOME)/.wminetrc
-#	cp wminetrc /etc/wminetrc
-#	chmod 644 /etc/wminetrc
-	@echo "wmitime Installation finished..."
-
-
-
-
-
-
-
-
-
-
-
-
-