diff --git a/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-flags.patch b/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-flags.patch
new file mode 100644
index 0000000000..9e30852980
--- /dev/null
+++ b/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-flags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -7,11 +7,10 @@ LIBI2PD_PATH = $(I2PD_PATH)/libi2pd
+ LIBI2PD_CLIENT_PATH = $(I2PD_PATH)/libi2pd_client
+ 
+ CXX ?= g++
+-CXXFLAGS = -Wall -std=c++17
++CXXFLAGS += -Wall -std=c++17
+ INCFLAGS = -I$(LIBI2PD_PATH) -I$(LIBI2PD_CLIENT_PATH)
+ DEFINES = -DOPENSSL_SUPPRESS_DEPRECATED
+ 
+-LDFLAGS = 
+ LDLIBS = $(I2PD_PATH)/$(I2PD_LIB) -lboost_system$(BOOST_SUFFIX) -lboost_date_time$(BOOST_SUFFIX) -lboost_filesystem$(BOOST_SUFFIX) -lboost_program_options$(BOOST_SUFFIX) -lssl -lcrypto -lz
+ 
+ ifeq ($(UNAME),Linux)
diff --git a/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-nodebug.patch b/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-nodebug.patch
new file mode 100644
index 0000000000..5a29fc814a
--- /dev/null
+++ b/app-admin/i2pd-tools/files/i2pd-tools-0.2023.03.12-nodebug.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,19 +14,6 @@ DEFINES = -DOPENSSL_SUPPRESS_DEPRECATED
+ LDFLAGS = 
+ LDLIBS = $(I2PD_PATH)/$(I2PD_LIB) -lboost_system$(BOOST_SUFFIX) -lboost_date_time$(BOOST_SUFFIX) -lboost_filesystem$(BOOST_SUFFIX) -lboost_program_options$(BOOST_SUFFIX) -lssl -lcrypto -lz
+ 
+-ifeq ($(UNAME),Linux)
+-	CXXFLAGS += -g
+-else ifeq ($(UNAME),Darwin)
+-	CXXFLAGS += -g
+-else ifeq ($(UNAME),FreeBSD)
+-	CXXFLAGS += -g
+-else
+-# Win32
+-	CXXFLAGS += -Os -fPIC -msse
+-	DEFINES += -DWIN32_LEAN_AND_MEAN
+-	BOOST_SUFFIX = -mt
+-endif
+-
+ ifeq ($(UNAME),Linux)
+ 	LDLIBS += -lrt -lpthread
+ else ifeq ($(UNAME),Darwin)
diff --git a/app-admin/i2pd-tools/i2pd-tools-0.2023.03.12.ebuild b/app-admin/i2pd-tools/i2pd-tools-0.2023.03.12.ebuild
index 04514b4876..60aec1b0c9 100644
--- a/app-admin/i2pd-tools/i2pd-tools-0.2023.03.12.ebuild
+++ b/app-admin/i2pd-tools/i2pd-tools-0.2023.03.12.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/0001-${PN}-nodebug.patch
-	"${FILESDIR}"/0002-${PN}-flags.patch
+	"${FILESDIR}"/${P}-nodebug.patch
+	"${FILESDIR}"/${P}-flags.patch
 )
 
 src_unpack() {