diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile
index 8a30e28ce09f..f9a963002b84 100644
--- a/misc/sdformat/Makefile
+++ b/misc/sdformat/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	sdformat
 DISTVERSION=	8.0.0
 PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulation Description Format (SDF) parser and description files
 WWW=		https://bitbucket.org/osrf/sdformat/src/default/
 
 LICENSE=	APACHE20
 
-BROKEN=		does not build: src/parser_urdf.cc:30:10: fatal error: 'urdf_model/model.h' file not found
-
 BUILD_DEPENDS=	ignition-cmake==2:devel/ignition-cmake \
 		ignition-tools>0:devel/ignition-tools \
 		rubygem-rexml>0:textproc/rubygem-rexml
 LIB_DEPENDS=	libignition-math6.so:math/ignition-math \
 		libconsole_bridge.so:devel/ros-console_bridge \
 		libtinyxml2.so:textproc/tinyxml2 \
 		liburdfdom_world.so:devel/ros-urdfdom
 RUN_DEPENDS=	ignition-tools>0:devel/ignition-tools
 
 USES=		cmake compiler:c++17-lang pkgconfig
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_TESTING
 
 BB_ACCOUNT=	osrf
 BB_PROJECT=	${PORTNAME}
 BB_COMMIT=	f555f9a69f8f
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
 
 PLIST_SUB+=	INCSUBDIR=${PORTNAME}-${DISTVERSION:R}
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/misc/sdformat/files/patch-cmake_SearchForStuff.cmake b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake
index f302a1ebac69..39fe56827f33 100644
--- a/misc/sdformat/files/patch-cmake_SearchForStuff.cmake
+++ b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake
@@ -1,34 +1,51 @@
---- cmake/SearchForStuff.cmake.orig	2018-11-21 00:19:13 UTC
+--- cmake/SearchForStuff.cmake.orig	2018-11-14 23:55:43 UTC
 +++ cmake/SearchForStuff.cmake
 @@ -9,24 +9,24 @@ if (USE_EXTERNAL_TINYXML)
    #################################################
    # Find tinyxml. Only debian distributions package tinyxml with a pkg-config
    # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS)
 -  pkg_check_modules(tinyxml tinyxml)
 +  pkg_check_modules(tinyxml tinyxml2)
    if (NOT tinyxml_FOUND)
 -    find_path (tinyxml_include_dirs tinyxml.h ${tinyxml_include_dirs} ENV CPATH)
 -    find_library(tinyxml_LIBRARIES NAMES tinyxml)
 +    find_path (tinyxml_include_dirs tinyxml2.h ${tinyxml_include_dirs} ENV CPATH)
 +    find_library(tinyxml_LIBRARIES NAMES tinyxml2)
      set (tinyxml_FAIL False)
      if (NOT tinyxml_include_dirs)
 -      message (STATUS "Looking for tinyxml headers - not found")
 +      message (STATUS "Looking for tinyxml2 headers - not found")
        set (tinyxml_FAIL True)
      endif()
      if (NOT tinyxml_LIBRARIES)
 -      message (STATUS "Looking for tinyxml library - not found")
 +      message (STATUS "Looking for tinyxml2 library - not found")
        set (tinyxml_FAIL True)
      endif()
    endif()
  
    if (tinyxml_FAIL)
 -    message (STATUS "Looking for tinyxml.h - not found")
 -    BUILD_ERROR("Missing: tinyxml")
 +    message (STATUS "Looking for tinyxml2.h - not found")
 +    BUILD_ERROR("Missing: tinyxml2")
    endif()
  else()
    # Needed in WIN32 since in UNIX the flag is added in the code installed
+@@ -55,6 +55,7 @@ endif()
+ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
+   # check for urdfdom with pkg-config
+   pkg_check_modules(URDF urdfdom>=1.0)
++  pkg_check_modules(URDF_h urdfdom_headers>=1.0)
+ 
+   if (NOT URDF_FOUND)
+     if (NOT DEFINED USE_INTERNAL_URDF)
+@@ -65,7 +66,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_
+     endif()
+   else()
+     # what am I doing here? pkg-config and cmake
+-    set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR})
++    set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR} ${URDF_h_INCLUDEDIR})
+     set(URDF_LIBRARY_DIRS ${URDF_LIBDIR})
+   endif()
+ endif()