diff --git a/.gitignore b/.gitignore
index 7265fa1071d..0b260d5e0b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ source/script/installbin.sh
 source/script/uninstallbin.sh
 source/smbd/build_options.c
 source/tags
-source/utils/passwd_proto.h
 source/include/includes.h.gch
 source/config.cache
 source/library-versions
diff --git a/source/Makefile.in b/source/Makefile.in
index dd9b7c011b1..dbefd4add0f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2308,7 +2308,7 @@ delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
 		smbd/build_options.c \
-		utils/passwd_proto.h libnet/libnet_proto.h
+		libnet/libnet_proto.h
 
 MKPROTO_SH = $(srcdir)/script/mkproto.sh
 
@@ -2317,11 +2317,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-utils/passwd_proto.h:
-	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-	  -h _PASSWD_PROTO_H_ $(builddir)/utils/passwd_proto.h \
-	  $(PASSWD_UTIL_OBJ)
-
 libnet/libnet_proto.h:
 	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
 	  -h _LIBNET_PROTO_H_ $(builddir)/libnet/libnet_proto.h \
@@ -2334,7 +2329,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) utils/passwd_proto.h; \
 	$(MAKE) libnet/libnet_proto.h;
 
 proto: headers
diff --git a/source/utils/passwd_proto.h b/source/utils/passwd_proto.h
new file mode 100644
index 00000000000..104e00a65c3
--- /dev/null
+++ b/source/utils/passwd_proto.h
@@ -0,0 +1,32 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * collected prototypes header
+ *
+ * frozen from "make proto" in May 2008
+ *
+ * Copyright (C) Michael Adam 2008
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _PASSWD_PROTO_H_
+#define _PASSWD_PROTO_H_
+
+
+/* The following definitions come from utils/passwd_util.c  */
+
+char *stdin_new_passwd( void);
+char *get_pass( const char *prompt, bool stdin_get);
+
+#endif /*  _PASSWD_PROTO_H_  */