diff --git a/Makefile.in b/Makefile.in
index e0573c3..bdc8725 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,17 +60,17 @@ strip: $(PRPL_LIBNAME)
 	$(STRIP) --strip-unneeded $(PRPL_LIBNAME)
 
 .PHONY: install
-# TODO: Find a better place for server.pub
 install: $(PRPL_LIBNAME)
-	install -D $(PRPL_LIBNAME) $(DESTDIR)$(PLUGIN_DIR_PURPLE)/$(PRPL_NAME)
-	install -D tg-server.pub $(DESTDIR)/etc/telegram-purple/server.pub
-	install -D imgs/telegram16.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
-	install -D imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
-	install -D imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
+	mkdir -p $(DESTDIR)/etc/telegram-purple
+	install $(PRPL_LIBNAME) $(DESTDIR)$(PLUGIN_DIR_PURPLE)/$(PRPL_NAME)
+	install tg-server.pub $(DESTDIR)/etc/telegram-purple/server.pub
+	install imgs/telegram16.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
+	install imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
+	install imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
 
 .PHONY: local_install
 local_install:
-	install -D $(PRPL_LIBNAME) ${HOME}/.purple/plugins/$(PRPL_NAME)
+	install $(PRPL_LIBNAME) ${HOME}/.purple/plugins/$(PRPL_NAME)
 
 .PHONY: uninstall
 uninstall:
@@ -82,7 +82,7 @@ uninstall:
 	rm -f ${HOME}/.purple/plugins/$(PRPL_NAME)
 
 .PHONY: run
-run: install
+run:
 	pidgin -d | grep 'telegram\|plugin\|proxy'
 
 .PHONY: purge