diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 844e93ce9d26..7ca5cfe37a4a 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -1,52 +1,59 @@
 # Created by: Simon Barner <barner@gmx.de>
 
 PORTNAME=	irrlicht
-PORTVERSION=	1.8.4
-PORTREVISION=	3
+PORTVERSION=	1.8.5
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High performance realtime 3D engine
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/readme.txt
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
 USES=		alias cpe dos2unix gl gmake jpeg zip xorg
+DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
 USE_GL=		gl
 USE_XORG=	x11 xxf86vm
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	sharedlib
 PLIST_SUB=	PORTVERSION=${PORTVERSION} SOVERSION=${PORTVERSION:R}
 SUB_FILES=	pkg-message
 BUILD_WRKSRC=	${WRKSRC}/source/Irrlicht
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 EXAMPLEDIRS=	01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement \
 		05.UserInterface 06.2DGraphics 07.Collision 08.SpecialFX \
 		09.Meshviewer 10.Shaders 11.PerPixelLighting \
 		12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile Demo
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES
 
 DEBUG_MAKE_ENV_OFF=	NDEBUG=1
 
+post-extract:
+.for bundled in bzip2 jpeglib libpng zlib
+	@${RM} -r ${WRKSRC}/source/Irrlicht/${bundled}
+.endfor
+
 post-patch:
 	@${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \
 		-e '/#define.*_IRR_USE_NON_SYSTEM_BZLIB_/ d' \
 		-e '/#define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \
 		${WRKSRC}/include/IrrCompileConfig.h
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIrrlicht.so
+
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${EXAMPLEDIRS}" \
 		${STAGEDIR}${EXAMPLESDIR} \
 		"( -name Makefile -or -name *\.cpp -or -name *\.h )"
 	cd ${WRKSRC} && ${COPYTREE_SHARE} media ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo
index 72199b037e84..c35fcf093d4e 100644
--- a/x11-toolkits/irrlicht/distinfo
+++ b/x11-toolkits/irrlicht/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471244398
-SHA256 (irrlicht-1.8.4.zip) = f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433
-SIZE (irrlicht-1.8.4.zip) = 27927144
+TIMESTAMP = 1636380510
+SHA256 (irrlicht-1.8.5.zip) = effb7beed3985099ce2315a959c639b4973aac8210f61e354475a84105944f3d
+SIZE (irrlicht-1.8.5.zip) = 21827696
diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
index 45820c030e0f..a4b9a956780f 100644
--- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
+++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
@@ -1,46 +1,47 @@
---- source/Irrlicht/Makefile.orig	2014-10-18 07:47:20 UTC
+--- source/Irrlicht/Makefile.orig	2021-11-08 14:14:39 UTC
 +++ source/Irrlicht/Makefile
-@@ -56,23 +56,20 @@
+@@ -58,23 +58,20 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crc
  EXTRAOBJ =
  LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
  	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
 -	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
+-	$(BZIP2OBJ) $(EXTRAOBJ)
 +	$(IRRGUIOBJ) $(LIBAESGM) \
- 	$(BZIP2OBJ) $(EXTRAOBJ)
++	$(EXTRAOBJ)
  
  ###############
  #Compiler flags
 -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
 +CXXINCS = -I../../include -I${LOCALBASE}/include
  CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
  CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
  ifndef NDEBUG
  CXXFLAGS += -g -D_DEBUG
 -else
 -CXXFLAGS += -fexpensive-optimizations -O3
  endif
  ifdef PROFILE
  CXXFLAGS += -pg
  endif
 -CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
  
  sharedlib sharedlib_osx: CXXFLAGS += -fPIC
  sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -83,13 +80,13 @@
+@@ -85,13 +82,13 @@ LIBSELECT=64
  endif
  
  #Linux specific options
 -staticlib sharedlib install: SYSTEM = Linux
 +staticlib sharedlib install: SYSTEM = FreeBSD
  STATIC_LIB = libIrrlicht.a
  LIB_PATH = ../../lib/$(SYSTEM)
 -INSTALL_DIR = /usr/local/lib
 +INSTALL_DIR = ${DESTDIR}${PREFIX}/lib
  sharedlib install: SHARED_LIB = libIrrlicht.so
 -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
 -staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
 +sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lX11 -lpng -ljpeg -lbz2 -lz
 +staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include
  
  #OSX specific options
  staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
diff --git a/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h b/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h
deleted file mode 100644
index 8833461a0710..000000000000
--- a/x11-toolkits/irrlicht/files/patch-source__Irrlicht__COpenGLExtensionHandler.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/Irrlicht/COpenGLExtensionHandler.h.orig	2014-10-18 08:53:44 UTC
-+++ source/Irrlicht/COpenGLExtensionHandler.h
-@@ -59,6 +59,9 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#include <GL/glx.h>
-+	#ifndef PFNGLBLENDEQUATIONPROC
-+	typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-+	#endif
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 	#include "glext.h"
- 	#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h