diff --git a/misc/mime-support/Makefile b/misc/mime-support/Makefile
index ec375534fa93..543e0ee65856 100644
--- a/misc/mime-support/Makefile
+++ b/misc/mime-support/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	mime-support
-PORTVERSION=	3.40.1
+PORTVERSION=	3.40.1.1
 PORTREVISION=	0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=	${PORTNAME}_${PORTVERSION:C/(.*)\.([^.])/\1-\2/}
+DISTNAME=	${PORTNAME}_${PORTVERSION:C/([0-9]*\.[0-9]*)\.(.*)/\1-\2/}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	MIME Media Types list
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]*\.[0-9]*).*/\1/}
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/run-mailcap etc/mime.types
diff --git a/misc/mime-support/distinfo b/misc/mime-support/distinfo
index df59c1fe02bd..64df31296859 100644
--- a/misc/mime-support/distinfo
+++ b/misc/mime-support/distinfo
@@ -1,3 +1,3 @@
-MD5 (mime-support_3.40-1.tar.gz) = 3990cf774db416844466d2d4d692f57a
-SHA256 (mime-support_3.40-1.tar.gz) = 8f074c41a03eb3a84f5d8c65aba978d6e3a23ac58f52213cb653c3d18a06587f
-SIZE (mime-support_3.40-1.tar.gz) = 53069
+MD5 (mime-support_3.40-1.1.tar.gz) = 16095273c1380732105f3ffd4387a82c
+SHA256 (mime-support_3.40-1.1.tar.gz) = 0b30c48c6a1087d8eddf7ec37cbef00db534948f0b4b576af5e7c82d383a5ef0
+SIZE (mime-support_3.40-1.1.tar.gz) = 53126