diff --git a/Aliases/libpqxx@4 b/Aliases/libpqxx@5
similarity index 100%
rename from Aliases/libpqxx@4
rename to Aliases/libpqxx@5
diff --git a/Formula/libpqxx.rb b/Formula/libpqxx.rb
index 97d58933d85..f59f3c2afaf 100644
--- a/Formula/libpqxx.rb
+++ b/Formula/libpqxx.rb
@@ -1,9 +1,8 @@
 class Libpqxx < Formula
   desc "C++ connector for PostgreSQL"
   homepage "http://pqxx.org/development/libpqxx/"
-  url "http://pqxx.org/download/software/libpqxx/libpqxx-4.0.1.tar.gz"
-  sha256 "097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38"
-  revision 2
+  url "https://github.com/jtv/libpqxx/archive/5.0.1.tar.gz"
+  sha256 "21ba7167aeeb76142c0e865127514b4834cefde45eaab2d5eb79099188e21a06"
 
   bottle do
     cellar :any
@@ -16,71 +15,21 @@ class Libpqxx < Formula
   depends_on "pkg-config" => :build
   depends_on :postgresql
 
-  # Patches borrowed from MacPorts. See:
-  # https://trac.macports.org/ticket/33671
-  #
-  # (1) Patched maketemporary to avoid an error message about improper use
-  #     of the mktemp command; apparently maketemporary is designed to call
-  #     mktemp in various ways, some of which may be improper, as it attempts
-  #     to determine how to use it properly; we don't want to see those errors
-  #     in the configure phase output.
-  # (2) Patched configure on darwin to fix incorrect assumption
-  #     that true and false always live in /bin; on macOS they live in /usr/bin.
-  patch :DATA
-
   def install
     system "./configure", "--prefix=#{prefix}", "--enable-shared"
     system "make", "install"
   end
+
+  test do
+    (testpath/"test.cpp").write <<~EOS
+      #include <pqxx/pqxx>
+      int main(int argc, char** argv) {
+        pqxx::connection con;
+        return 0;
+      }
+    EOS
+    system ENV.cxx, "test.cpp", "-L#{lib}", "-lpqxx", "-I#{include}", "-o", "test"
+    # Running ./test will fail because there is no runnning postgresql server
+    # system "./test"
+  end
 end
-
-__END__
---- a/tools/maketemporary.orig	2009-07-04 00:38:30.000000000 -0500
-+++ b/tools/maketemporary	2012-03-18 01:13:26.000000000 -0500
-@@ -5,7 +5,7 @@
- TMPDIR="${TMPDIR:-/tmp}"
- export TMPDIR
-
--T="`mktemp`"
-+T="`mktemp 2>/dev/null`"
- if test -z "$T" ; then
-	T="`mktemp -t pqxx.XXXXXX`"
- fi
---- a/configure.orig	2011-11-27 05:12:25.000000000 -0600
-+++ b/configure	2012-03-18 01:09:08.000000000 -0500
-@@ -15204,7 +15204,7 @@
- fi
-
-
-- if /bin/true; then
-+ if /usr/bin/true; then
-   BUILD_REFERENCE_TRUE=
-   BUILD_REFERENCE_FALSE='#'
- else
-@@ -15290,7 +15290,7 @@
- fi
-
-
-- if /bin/true; then
-+ if /usr/bin/true; then
-   BUILD_TUTORIAL_TRUE=
-   BUILD_TUTORIAL_FALSE='#'
- else
-@@ -15299,7 +15299,7 @@
- fi
-
- else
-- if /bin/false; then
-+ if /usr/bin/false; then
-   BUILD_REFERENCE_TRUE=
-   BUILD_REFERENCE_FALSE='#'
- else
-@@ -15307,7 +15307,7 @@
-   BUILD_REFERENCE_FALSE=
- fi
-
-- if /bin/false; then
-+ if /usr/bin/false; then
-   BUILD_TUTORIAL_TRUE=
-   BUILD_TUTORIAL_FALSE='#'
- else