diff --git a/.buildkite/package_extension.sh b/.buildkite/package_extension.sh
index 3b739dc..9858466 100644
--- a/.buildkite/package_extension.sh
+++ b/.buildkite/package_extension.sh
@@ -7,7 +7,7 @@ BASEDIR=`dirname $BASEDIR`
 PACKAGENAME="tideways-xhprof"
 DESCRIPTION="tideways-xhprof is a modern XHProf fork built for PHP 7."
 EXTENSION="tideways_xhprof"
-VERSIONS=( "7.0" "7.1" "7.2" "7.3" "7.1-zts" "7.2-zts" "7.3-zts" )
+VERSIONS=( "7.0" "7.1" "7.2" "7.3" "7.4" "7.1-zts" "7.2-zts" "7.3-zts" "7.4-zts" )
 PACKAGES=( "deb" "rpm" )
 ARCHITECTURE=`uname -m`
 ARCHITECTURE=${ARCHITECTURE/686/386}
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5a45291..42ca63b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,6 +2,13 @@ env:
     NO_INTERACTION: 1
 
 steps:
+    - label: ":php: 7.4 amd64"
+      command: ./.buildkite/build_extension.sh 7.4
+      agents:
+          phpbuild: "no-debug"
+          queue: "build"
+          arch: "x86_64"
+
     - label: ":php: 7.3 amd64"
       command: ./.buildkite/build_extension.sh 7.3
       agents:
@@ -30,6 +37,13 @@ steps:
           queue: "build"
           arch: "x86_64"
 
+    - label: ":php: 7.4-zts amd64"
+      command: ./.buildkite/build_extension.sh 7.4-zts
+      agents:
+          phpbuild: "no-debug"
+          queue: "build"
+          arch: "x86_64"
+
     - label: ":php: 7.3-zts amd64"
       command: ./.buildkite/build_extension.sh 7.3-zts
       agents:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e92285e..6ae0514 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.0.2
+
+- [#90](https://github.com/tideways/php-xhprof-extension/issues/90): Add packaging for PHP 7.4
+
 # 5.0.1
 
 - [#86](https://github.com/tideways/php-xhprof-extension/pull/86): Fix bug in Apple/MacOS timer code that prevented wall time measurements from working.
diff --git a/php_tideways_xhprof.h b/php_tideways_xhprof.h
index 248d571..98a274d 100644
--- a/php_tideways_xhprof.h
+++ b/php_tideways_xhprof.h
@@ -4,7 +4,7 @@
 extern zend_module_entry tideways_xhprof_module_entry;
 #define phpext_tideways_xhprof_ptr &tideways_xhprof_module_entry
 
-#define PHP_TIDEWAYS_XHPROF_VERSION "5.0.1"
+#define PHP_TIDEWAYS_XHPROF_VERSION "5.0.2"
 #define TIDEWAYS_XHPROF_CALLGRAPH_COUNTER_SIZE 1024
 #define TIDEWAYS_XHPROF_CALLGRAPH_SLOTS 8192
 #define TIDEWAYS_XHPROF_CLOCK_CGT 0