diff --git a/Makefile b/Makefile
index ceb58b9..8e9a662 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ install: all
 	ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/man6/ponythink.6"
 
 	mkdir -p "$(DESTDIR)/usr/share/man/es/man6"
-	install "manpage.es.1" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6"
+	install "manpage.es.6" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6"
 	ln -sf "ponysay.6" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6"
 
 uninstall:
@@ -45,7 +45,5 @@ uninstall:
 	unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6"
 	unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6"
 	unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6"
-
->>>>>>> upstream/master
 clean:
 	rm -f "ponysaytruncater"