diff --git a/biology/diamond/Makefile b/biology/diamond/Makefile
index 7c2313831d8c..e40619022484 100644
--- a/biology/diamond/Makefile
+++ b/biology/diamond/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	diamond
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.23-6
-DISTVERSIONSUFFIX=	-gfecab3e
+DISTVERSION=	0.9.24
 CATEGORIES=	biology
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -18,10 +17,9 @@ USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	bbuchfink
 
-CFLAGS+=	-DNDEBUG
 PLIST_FILES=	bin/diamond
-.if ! defined(PACKAGE_BUILDING)
-CXXFLAGS+=	-march=native
+.if defined(PACKAGE_BUILDING)
+CFLAGS+=	-mtune=generic
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/diamond/distinfo b/biology/diamond/distinfo
index 5a0ecd3476ed..515fe75204e4 100644
--- a/biology/diamond/distinfo
+++ b/biology/diamond/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544706267
-SHA256 (bbuchfink-diamond-v0.9.23-6-gfecab3e_GH0.tar.gz) = 1d7c48b4da45854d75c9f90809a050fead6ffa8ad0b67447df7146e6849d5319
-SIZE (bbuchfink-diamond-v0.9.23-6-gfecab3e_GH0.tar.gz) = 424626
+TIMESTAMP = 1546047321
+SHA256 (bbuchfink-diamond-v0.9.24_GH0.tar.gz) = 22e8fc3980c2f5d6b584d4fefa3406172141697f7cb32b9742cb43a593b4ff24
+SIZE (bbuchfink-diamond-v0.9.24_GH0.tar.gz) = 425582
diff --git a/biology/diamond/files/patch-CMakeLists.txt b/biology/diamond/files/patch-CMakeLists.txt
deleted file mode 100644
index 1a417c04952c..000000000000
--- a/biology/diamond/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2018-12-07 02:22:51 UTC
-+++ CMakeLists.txt
-@@ -12,16 +12,6 @@ endif()
- 
- set(CMAKE_CXX_STANDARD 11)
- 
--if(CMAKE_BUILD_MARCH)
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CMAKE_BUILD_MARCH}")
--else()
--  include(CheckCXXCompilerFlag)
--  CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCHNATIVE)
--  if(COMPILER_SUPPORTS_MARCHNATIVE)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
--  endif()
--endif()
--
- find_package(ZLIB REQUIRED)
- find_package(Threads REQUIRED)
- 
diff --git a/biology/diamond/pkg-message b/biology/diamond/pkg-message
new file mode 100644
index 000000000000..76f84fd471f8
--- /dev/null
+++ b/biology/diamond/pkg-message
@@ -0,0 +1,6 @@
+=======================================================================
+
+For best performance, it is recommended to build diamond on the
+target system.
+
+=======================================================================