diff --git a/python-httpbin.changes b/python-httpbin.changes
index b265f03..655ad47 100644
--- a/python-httpbin.changes
+++ b/python-httpbin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 01:22:41 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch remove-six.patch:
+  * Remove use of six.
+
 -------------------------------------------------------------------
 Tue Oct  1 14:35:38 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
diff --git a/python-httpbin.spec b/python-httpbin.spec
index bb5ccf5..e050e35 100644
--- a/python-httpbin.spec
+++ b/python-httpbin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-httpbin
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ Summary:        HTTP Request and Response Service
 License:        MIT
 URL:            https://github.com/psf/httpbin
 Source:         https://files.pythonhosted.org/packages/source/h/%{modname}/%{modname}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#psf/httpbin#40
+Patch0:         remove-six.patch
 BuildRequires:  %{python_module Brotli}
 BuildRequires:  %{python_module Flask >= 2.2.4}
 BuildRequires:  %{python_module Werkzeug >= 2.0}
@@ -43,7 +45,6 @@ Requires:       python-Werkzeug >= 2.2.2
 Requires:       python-decorator
 Requires:       python-flasgger
 Requires:       python-gevent
-Requires:       python-six
 BuildArch:      noarch
 %python_subpackages
 
@@ -78,6 +79,6 @@ export LANG=en_US.UTF-8
 %doc README.md
 %license LICENSE
 %{python_sitelib}/httpbin
-%{python_sitelib}/httpbin-%{version}*-info
+%{python_sitelib}/httpbin-%{version}.dist-info
 
 %changelog
diff --git a/remove-six.patch b/remove-six.patch
new file mode 100644
index 0000000..7d4726e
--- /dev/null
+++ b/remove-six.patch
@@ -0,0 +1,57 @@
+From 17d02f215e18df999facc20808f47fcbb72f3a18 Mon Sep 17 00:00:00 2001
+From: Alexandre Detiste <alexandre.detiste@gmail.com>
+Date: Fri, 5 Jan 2024 15:21:04 +0100
+Subject: [PATCH] cleanup remaining usage of "six"
+
+---
+ httpbin/filters.py | 2 +-
+ httpbin/helpers.py | 3 ++-
+ pyproject.toml     | 1 -
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/httpbin/filters.py b/httpbin/filters.py
+index 4deeaaad..a656279e 100644
+--- a/httpbin/filters.py
++++ b/httpbin/filters.py
+@@ -12,7 +12,7 @@
+ 
+ import brotlicffi as _brotli
+ 
+-from six import BytesIO
++from io import BytesIO
+ from decimal import Decimal
+ from time import time as now
+ 
+diff --git a/httpbin/helpers.py b/httpbin/helpers.py
+index 836c8026..cdf045c0 100644
+--- a/httpbin/helpers.py
++++ b/httpbin/helpers.py
+@@ -13,6 +13,8 @@
+ import time
+ import os
+ from hashlib import md5, sha256, sha512
++from urllib.parse import urlparse, urlunparse
++
+ from werkzeug.datastructures import WWWAuthenticate
+ from werkzeug.http import dump_header
+ 
+@@ -23,7 +25,6 @@
+     parse_authorization_header = Authorization.from_header
+ 
+ from flask import request, make_response
+-from six.moves.urllib.parse import urlparse, urlunparse
+ 
+ 
+ from .structures import CaseInsensitiveDict
+diff --git a/pyproject.toml b/pyproject.toml
+index c5bdb811..b82f7b6f 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -38,7 +38,6 @@ dependencies = [
+     'greenlet < 3.0; python_version<"3.12"',
+     'greenlet >= 3.0.0a1; python_version>="3.12.0rc0"',
+     'importlib-metadata; python_version<"3.8"',
+-    "six",
+     "werkzeug >= 2.2.2",
+ ]
+