diff --git a/net/tac_plus/Makefile b/net/tac_plus/Makefile
index ea3a9dca4b..381a044a61 100644
--- a/net/tac_plus/Makefile
+++ b/net/tac_plus/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=tac_plus
 PKG_VERSION:=4.0.4.28
 PKG_REV:=259251e6f1c2d5c98081a43c6f66d9eb2989cfd8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_DATE:=2019.02.11
@@ -11,7 +11,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/facebook/tac_plus/tar.gz/$(PKG_SOURC
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_DATE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_HASH:=3c37d6a8acf66cac4a95558bf3e29686ef3be505a1638e2ef788a7ece41d1b01
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)
 PKG_BUILD_SUBDIR:=tacacs-F$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -25,22 +25,58 @@ CONFIGURE_ARGS += \
 	--disable-shared \
 	--without-libwrap
 
-define Package/tac_plus
+ifeq ($(BUILD_VARIANT),without-pam)
+CONFIGURE_VARS += \
+	ac_cv_lib_pam_pam_start=no
+endif
+
+define Package/tac_plus/Default
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=TACACS+ daemon
 	URL:=https://github.com/facebook/tac_plus/
 endef
 
-define Package/tac_plus/description
+define Package/tac_plus
+$(call Package/tac_plus/Default)
+	TITLE+= (without PAM support)
+	VARIANT:=without-pam
+endef
+
+define Package/tac_plus-pam
+$(call Package/tac_plus/Default)
+	TITLE+= (with PAM support)
+	DEPENDS+= +libpam
+	VARIANT:=with-pam
+endef
+
+define Package/tac_plus/Default/description
 TACACS+ is a protocol (not TACACS or XTACACS) for authentication,
 authorization and accounting (AAA) services for routers and network devices.
 endef
 
-define Package/tac_plus/conffiles
+define Package/tac_plus/description
+$(call Package/tac_plus/Default/description)
+This package is built without PAM support.
+endef
+
+define Package/tac_plus-pam/description
+$(call Package/tac_plus/Default/description)
+This package is built with PAM support.
+endef
+
+define Package/tac_plus/Default/conffiles
 /etc/tac_plus.conf
 endef
 
+define Package/tac_plus/conffiles
+$(call Package/tac_plus/Default/conffiles)
+endef
+
+define Package/tac_plus-pam/conffiles
+$(call Package/tac_plus/Default/conffiles)
+endef
+
 define Package/tac_plus/install
 	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
 	$(INSTALL_CONF) ./files/tac_plus.conf $(1)/etc/tac_plus.conf
@@ -48,4 +84,12 @@ define Package/tac_plus/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_BUILD_SUBDIR)/tac_plus $(1)/usr/sbin/
 endef
 
+define Package/tac_plus-pam/install
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_CONF) ./files/tac_plus.conf $(1)/etc/tac_plus.conf
+	$(INSTALL_BIN) ./files/tac_plus.init $(1)/etc/init.d/tac_plus
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_BUILD_SUBDIR)/tac_plus $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,tac_plus))
+$(eval $(call BuildPackage,tac_plus-pam))