Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -954,7 +954,6 @@
     SUBDIR += py-ansible-runner
     SUBDIR += py-bcfg2
     SUBDIR += py-cdmi
-    SUBDIR += py-consul
     SUBDIR += py-croniter
     SUBDIR += py-crontab
     SUBDIR += py-diffoscope
@@ -978,7 +977,6 @@
     SUBDIR += py-iowait
     SUBDIR += py-mqttwarn
     SUBDIR += py-nagiosplugin
-    SUBDIR += py-nomad
     SUBDIR += py-packet-python
     SUBDIR += py-pkginfo
     SUBDIR += py-ploy
@@ -991,6 +989,8 @@
     SUBDIR += py-psutil
     SUBDIR += py-psutil121
     SUBDIR += py-ptyprocess
+    SUBDIR += py-python-consul
+    SUBDIR += py-python-nomad
     SUBDIR += py-pytsk
     SUBDIR += py-pywatchman
     SUBDIR += py-pyznap
Index: sysutils/py-nomad/Makefile
===================================================================
--- sysutils/py-nomad/Makefile
+++ sysutils/py-nomad/Makefile
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	py-nomad
-PORTVERSION=	0.5.0
-CATEGORIES=	sysutils
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	jhixson@FreeBSD.org
-COMMENT=	Python client for nomad
-
-LICENSE=	MIT
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR}
-
-USES=	python:3.3+
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	jrxFive
-GH_PROJECT=	python-nomad
-
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>
Index: sysutils/py-nomad/distinfo
===================================================================
--- sysutils/py-nomad/distinfo
+++ sysutils/py-nomad/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1507912742
-SHA256 (jrxFive-python-nomad-0.5.0_GH0.tar.gz) = 1ba2acab7995f0a504bdeea0df06f6ce93c60c1faacfa49b10bc2bb146a8d5ad
-SIZE (jrxFive-python-nomad-0.5.0_GH0.tar.gz) = 16255
Index: sysutils/py-nomad/pkg-descr
===================================================================
--- sysutils/py-nomad/pkg-descr
+++ sysutils/py-nomad/pkg-descr
@@ -1,9 +0,0 @@
-Python client for nomad (WWW: http://www.nomadproject.io)
-
-Nomad is a tool for managing a cluster of machines and running
-applications on them.
-Nomad abstracts away machines and the location of applications,
-and instead enables users to declare what they want to run and
-Nomad handles where they should run and how to run them.
-
-WWW: https://github.com/jrxFive/python-nomad
Index: sysutils/py-python-nomad/Makefile
===================================================================
--- sysutils/py-python-nomad/Makefile
+++ sysutils/py-python-nomad/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	py-nomad
+PORTNAME=	python-nomad
 PORTVERSION=	0.5.0
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}