diff --git a/Makefile b/Makefile
index 424c6b369d01de2219e4fef09e9b864d4bb7e660..893adfac6af4bf8dcc01176ed5b84b314e3defa0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ SUBDIR+=	antlr2
 SUBDIR+=	aruco-ros
 SUBDIR+=	backward-ros
 SUBDIR+=	can-utils
-SUBDIR+=	certi
 SUBDIR+=	cppad
 SUBDIR+=	cppadcodegen
 SUBDIR+=	dptu-genom3
diff --git a/certi/DESCR b/certi/DESCR
deleted file mode 100644
index 92d11dc9831be295ddedfda17a64f2f4e9e23de0..0000000000000000000000000000000000000000
--- a/certi/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-CERTI is an Open Source HLA RTI. HLA (High-Level Architecture) is a general
-purpose architecture for distributed computer simulation systems. In HLA
-systems, the RTI (RunTime Infrastructure) manages data exchange between
-simulations. CERTI supports HLA 1.3 specifications (C++ and Java) and partial
-IEEE 1516-2000 (C++).  CERTI is open source software (GPL, libraries are LGPL).
diff --git a/certi/Makefile b/certi/Makefile
deleted file mode 100644
index c9ff23346735f5552998f22f7ee07ec16ba77f97..0000000000000000000000000000000000000000
--- a/certi/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# robotpkg Makefile for:	architecture/certi
-# Created:			Arnaud Degroote on Tue, 12 Mar 2013
-#
-
-PKG_VERSION=	3.5.1
-DISTNAME= 		CERTI-${PKG_VERSION}-Source
-PKGNAME= 		certi-${PKG_VERSION}
-CATEGORIES=		architecture
-MASTER_SITES=	http://download.savannah.gnu.org/releases/certi/
-MASTER_REPOSITORY=	git git://git.savannah.nongnu.org/certi.git
-
-MAINTAINER=	arnaud.degroote@isae-supaero.fr
-HOMEPAGE=	https://savannah.nongnu.org/projects/certi
-COMMENT=	An Open Source HLA RTI (High Level Architecture)
-LICENSE=	gnu-gpl-v2
-
-DEPEND_ABI.cmake= cmake>=2.8.11
-
-CMAKE_ARGS+= 	-DCERTI_USE_NULL_PRIME_MESSAGE_PROTOCOL=ON
-
-PKG_SUPPORTED_OPTIONS+=		gui
-PKG_OPTION_DESCR.gui=		Enable GUI support
-define PKG_OPTION_SET.gui
-  CMAKE_ARGS+=			-DFORCE_NO_X11=OFF
-  include ../../mk/sysdep/libX11.mk
-endef
-define PKG_OPTION_UNSET.gui
-  CMAKE_ARGS+=			-DFORCE_NO_X11=ON
-endef
-
-include ../../mk/sysdep/cmake.mk
-include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
-include ../../mk/sysdep/bison.mk
-include ../../mk/sysdep/flex.mk
-include ../../mk/sysdep/libxml2.mk
-include ../../mk/robotpkg.mk
diff --git a/certi/PLIST b/certi/PLIST
deleted file mode 100644
index 38bdafeee64cfb0cedeb6e33fc9f9d60f0f980cc..0000000000000000000000000000000000000000
--- a/certi/PLIST
+++ /dev/null
@@ -1,154 +0,0 @@
-@comment Fri Oct 9 09:13:37 CEST 2015
-bin/CertiCheckHostAndIP
-bin/CertiCheckXML
-bin/CertiProcessus_A
-bin/CertiProcessus_B
-bin/CertiTestFederate-HLA13
-bin/CertiTestFederate-IEEE1516_2000
-bin/CertiTestFederate-IEEE1516_2010
-bin/MessageBufferTests
-bin/MsgBufferTests
-${PLIST.gui}bin/billard
-bin/billard-nogui
-bin/certi-config
-bin/hlaomtdif2cpp.py
-bin/rtia
-bin/rtig
-include/hla13/NullFederateAmbassador.hh
-include/hla13/RTI.hh
-include/hla13/RTIambServices.hh
-include/hla13/RTItypes.hh
-include/hla13/baseTypes.hh
-include/hla13/federateAmbServices.hh
-include/hla13/fedtime.hh
-include/ieee1516-2000/RTI/Enums.h
-include/ieee1516-2000/RTI/Exception.h
-include/ieee1516-2000/RTI/FederateAmbassador.h
-include/ieee1516-2000/RTI/Handle.h
-include/ieee1516-2000/RTI/LogicalTime.h
-include/ieee1516-2000/RTI/LogicalTimeFactory.h
-include/ieee1516-2000/RTI/LogicalTimeInterval.h
-include/ieee1516-2000/RTI/NullFederateAmbassador.h
-include/ieee1516-2000/RTI/RTI1516.h
-include/ieee1516-2000/RTI/RTI1516fedTime.h
-include/ieee1516-2000/RTI/RTIambassador.h
-include/ieee1516-2000/RTI/RTIambassadorFactory.h
-include/ieee1516-2000/RTI/RangeBounds.h
-include/ieee1516-2000/RTI/SpecificConfig.h
-include/ieee1516-2000/RTI/Typedefs.h
-include/ieee1516-2000/RTI/VariableLengthData.h
-include/ieee1516-2000/RTI/certiLogicalTime.h
-include/ieee1516-2000/RTI/certiLogicalTimeFactory.h
-include/ieee1516-2000/RTI/certiLogicalTimeInterval.h
-include/ieee1516-2000/RTI/certiRTI1516.h
-include/ieee1516-2010/RTI/Enums.h
-include/ieee1516-2010/RTI/Exception.h
-include/ieee1516-2010/RTI/FederateAmbassador.h
-include/ieee1516-2010/RTI/Handle.h
-include/ieee1516-2010/RTI/LogicalTime.h
-include/ieee1516-2010/RTI/LogicalTimeFactory.h
-include/ieee1516-2010/RTI/LogicalTimeInterval.h
-include/ieee1516-2010/RTI/NullFederateAmbassador.h
-include/ieee1516-2010/RTI/RTI1516.h
-include/ieee1516-2010/RTI/RTI1516fedTime.h
-include/ieee1516-2010/RTI/RTIambassador.h
-include/ieee1516-2010/RTI/RTIambassadorFactory.h
-include/ieee1516-2010/RTI/RangeBounds.h
-include/ieee1516-2010/RTI/SpecificConfig.h
-include/ieee1516-2010/RTI/Typedefs.h
-include/ieee1516-2010/RTI/VariableLengthData.h
-include/ieee1516-2010/RTI/certiLogicalTime.h
-include/ieee1516-2010/RTI/certiLogicalTimeFactory.h
-include/ieee1516-2010/RTI/certiLogicalTimeInterval.h
-include/ieee1516-2010/RTI/certiRTI1516.h
-include/ieee1516-2010/RTI/encoding/BasicDataElements.h
-include/ieee1516-2010/RTI/encoding/DataElement.h
-include/ieee1516-2010/RTI/encoding/EncodingConfig.h
-include/ieee1516-2010/RTI/encoding/EncodingExceptions.h
-include/ieee1516-2010/RTI/encoding/HLAfixedArray.h
-include/ieee1516-2010/RTI/encoding/HLAfixedRecord.h
-include/ieee1516-2010/RTI/encoding/HLAopaqueData.h
-include/ieee1516-2010/RTI/encoding/HLAvariableArray.h
-include/ieee1516-2010/RTI/encoding/HLAvariantRecord.h
-include/ieee1516-2010/RTI/time/HLAfloat64Interval.h
-include/ieee1516-2010/RTI/time/HLAfloat64Time.h
-include/ieee1516-2010/RTI/time/HLAfloat64TimeFactory.h
-include/ieee1516-2010/RTI/time/HLAinteger64Interval.h
-include/ieee1516-2010/RTI/time/HLAinteger64Time.h
-include/ieee1516-2010/RTI/time/HLAinteger64TimeFactory.h
-include/libhla/Clock.hh
-include/libhla/GettimeofdayClock.hh
-include/libhla/HLAbasicType.hh
-include/libhla/HLAbuffer.hh
-include/libhla/HLAenumeratedType.hh
-include/libhla/HLAfixedArray.hh
-include/libhla/HLAfixedRecord.hh
-include/libhla/HLAtypesIEEE1516.hh
-include/libhla/HLAvariableArray.hh
-include/libhla/HLAvariantRecord.hh
-include/libhla/MessageBuffer.hh
-include/libhla/MsgBuffer.h
-include/libhla/MurmurHash2.h
-include/libhla/MurmurHash3.h
-include/libhla/PMurHash.h
-include/libhla/PosixClock.hh
-include/libhla/SHM.hh
-include/libhla/SHMPosix.hh
-include/libhla/SHMSysV.hh
-include/libhla/Semaphore.hh
-include/libhla/SemaphorePosix.hh
-include/libhla/SemaphoreSysV.hh
-include/libhla/libhla.hh
-include/libhla/sha1.h
-include/libhla/tlsf.h
-lib/libCERTI.so
-lib/libCERTI.so.3
-lib/libCERTI.so.${PKGVERSION}
-lib/libFedTime.so
-lib/libFedTime.so.1
-lib/libFedTime.so.1.0.0
-lib/libFedTime1516.so
-lib/libFedTime1516.so.1
-lib/libFedTime1516.so.1.0.0
-lib/libFedTime1516e.so
-lib/libHLA.so
-lib/libHLA.so.3
-lib/libHLA.so.${PKGVERSION}
-lib/libRTI-NG.so
-lib/libRTI-NG.so.1
-lib/libRTI-NG.so.1.0.0
-lib/libRTI1516.so
-lib/libRTI1516.so.1
-lib/libRTI1516.so.1.0.0
-lib/libRTI1516e.so
-lib/libRTI1516e.so.1
-lib/libRTI1516e.so.1.0.0
-lib/libgraph-nogui.a
-${PLIST.gui}lib/libgraph.a
-share/doc/certi/favicon.ico
-share/doc/certi/index.html
-share/federations/Test.fed
-share/federations/Test.xml
-share/federations/testFederation.fed
-share/federations/testFederation.xml
-share/scripts/CERTIConfig.cmake
-share/scripts/CERTIConfigVersion.cmake
-share/scripts/CERTIDepends-release.cmake
-share/scripts/CERTIDepends.cmake
-share/scripts/FindCERTI.cmake
-share/scripts/FindRTI.cmake
-share/scripts/UseCERTI.cmake
-share/scripts/dtest_billard.py
-share/scripts/dtest_testFederate.py
-share/scripts/myCERTI_env.csh
-share/scripts/myCERTI_env.sh
-share/xml/README.txt
-share/xml/ieee1516-2000/1516_2-2000/HLA.dtd
-share/xml/ieee1516-2000/1516_2-2000/OMT-DIF.xml
-share/xml/ieee1516-2010/1516_1-2010/HLAstandardMIM.xml
-share/xml/ieee1516-2010/1516_1-2010/IEEE1516-FDD-2010.xsd
-share/xml/ieee1516-2010/1516_1-2010/hla1516e.wsdl
-share/xml/ieee1516-2010/1516_2-2010/IEEE1516-DIF-2010.xsd
-share/xml/ieee1516-2010/1516_2-2010/IEEE1516-OMT-2010.xsd
-share/xml/ieee1516-2010/1516_2-2010/RestaurantFOMmodule.xml
-share/xml/ieee1516-2010/1516_2-2010/RestaurantSOMmodule.xml
diff --git a/certi/depend.mk b/certi/depend.mk
deleted file mode 100644
index d3f26b2b2683d3732d7fa8c514af5aebcb11df0c..0000000000000000000000000000000000000000
--- a/certi/depend.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# robotpkg depend.mk for:	architecture/certi
-# Created:			Arnaud Degroote on Tue, 12 Mar 2013
-#
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-CERTI_LIBS_DEPEND_MK:=${CERTI_LIBS_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		certi
-endif
-
-ifeq (+,$(CERTI_LIBS_DEPEND_MK))
-PREFER.certi?=	robotpkg
-
-DEPEND_USE+=		certi
-
-DEPEND_ABI.certi?=	certi>=3.4.0
-DEPEND_DIR.certi?=	../../wip/certi
-
-SYSTEM_SEARCH.certi=\
-	bin/rtia 		\
-	include/hla13/RTI.hh  \
-	lib/libCERTI.so
-endif
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/certi/distinfo b/certi/distinfo
deleted file mode 100644
index 2b759d2f0069adf3fabd5f08eb841de77ed3497a..0000000000000000000000000000000000000000
--- a/certi/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (CERTI-3.5.1-Source.tar.gz) = b9f6abf28ba804de029fc9eb6c30d20cc932135f
-RMD160 (CERTI-3.5.1-Source.tar.gz) = 5c8d206d8d9459f49ec4b9ea86b95fdf440fad04
-Size (CERTI-3.5.1-Source.tar.gz) = 2123623 bytes