--- a/components/popt/Makefile	Fri Mar 11 05:36:16 2016 -0800
+++ b/components/popt/Makefile	Fri Mar 11 05:37:50 2016 -0800
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		popt
-COMPONENT_VERSION=	1.7
+COMPONENT_VERSION=	1.16
 COMPONENT_PROJECT_URL=	http://freecode.com/projects/popt/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:4e75cb28793f0d44134f71fae53057d5f250805e6268fbd9c9780654b73b0dc1
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/cross-stuff/files/cross-stuff/1.0/$(COMPONENT_ARCHIVE)/download
+    sha256:e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
+COMPONENT_ARCHIVE_URL=	https://launchpad.net/$(COMPONENT_NAME)/head/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/popt
 
-TPNO=			7904
+TPNO=			27265
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -45,10 +45,6 @@
 COMPONENT_PREP_ACTION = \
         (cd $(@D) ; $(TOUCH) config.rpath) ;
 
-# requires an older automake to reconfigure
-COMPONENT_PREP_ACTION += \
-	(cd $(@D) ; ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf -fiv)
-
 # Needed to get "gmake test" to work.
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -69,13 +65,15 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
 configure:	$(CONFIGURE_32_and_64)
 
 build:          $(BUILD_32_and_64)
 
 install:        $(INSTALL_32_and_64)
 
+# api-sanity-autotest.pl is part of the API Sanity Checker
+# http://ispras.linuxbase.org/index.php/API_Sanity_Autotest
+# (which we don't have in Solaris), so expect that test to fail.
 test:           $(TEST_32_and_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)