diff --git a/Misc/NEWS b/Misc/NEWS
index e5224ef..0e6e8d7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and builtins
 -----------------
 
+- Bug #959576: The pwd module is now builtin. This allows Python to be
+  built on UNIX platforms without $HOME set.
+
 - Bug #1072182, fix some potential problems if characters are signed.
 
 - Bug #889500, fix line number on SyntaxWarning for global declarations.
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index c735785..3a512b5 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -111,6 +111,8 @@
 
 posix posixmodule.c		# posix (UNIX) system calls
 errno errnomodule.c		# posix (UNIX) errno values
+pwd pwdmodule.c			# this is needed to find out the user's home dir
+				# if $HOME is not set
 _sre _sre.c			# Fredrik Lundh's new regular expressions
 _codecs _codecsmodule.c		# access to the builtin codecs and codec registry
 
@@ -186,7 +188,6 @@
 # supported...)
 
 #fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
-#pwd pwdmodule.c		# pwd(3) 
 #spwd spwdmodule.c		# spwd(3) 
 #grp grpmodule.c		# grp(3)
 #select selectmodule.c	# select(2); not on ancient System V