diff --git a/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0 b/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0
deleted file mode 100644
index a00505d6..00000000
--- a/tools-uclibc/portage.amd64.hardened/env/net-misc_wget_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-liconv
diff --git a/tools-uclibc/portage.amd64.hardened/package.env b/tools-uclibc/portage.amd64.hardened/package.env
deleted file mode 100644
index 67fe0dff..00000000
--- a/tools-uclibc/portage.amd64.hardened/package.env
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/wget net-misc_wget_0
diff --git a/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0 b/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0
deleted file mode 100644
index a00505d6..00000000
--- a/tools-uclibc/portage.amd64.vanilla/env/net-misc_wget_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-liconv
diff --git a/tools-uclibc/portage.amd64.vanilla/package.env b/tools-uclibc/portage.amd64.vanilla/package.env
deleted file mode 100644
index 67fe0dff..00000000
--- a/tools-uclibc/portage.amd64.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/wget net-misc_wget_0
diff --git a/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0 b/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0
deleted file mode 100644
index a00505d6..00000000
--- a/tools-uclibc/portage.i686.hardened/env/net-misc_wget_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-liconv
diff --git a/tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0 b/tools-uclibc/portage.i686.hardened/env/perl.conf
similarity index 100%
rename from tools-uclibc/portage.i686.hardened/env/dev-lang_perl_0
rename to tools-uclibc/portage.i686.hardened/env/perl.conf
diff --git a/tools-uclibc/portage.i686.hardened/package.env b/tools-uclibc/portage.i686.hardened/package.env
index 194a3ae0..0fc1e424 100644
--- a/tools-uclibc/portage.i686.hardened/package.env
+++ b/tools-uclibc/portage.i686.hardened/package.env
@@ -1,2 +1 @@
-dev-lang/perl dev-lang_perl_0
-net-misc/wget net-misc_wget_0
+dev-lang/perl perl.conf
diff --git a/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0 b/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0
deleted file mode 100644
index a00505d6..00000000
--- a/tools-uclibc/portage.i686.vanilla/env/net-misc_wget_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS=-liconv
diff --git a/tools-uclibc/portage.i686.vanilla/package.env b/tools-uclibc/portage.i686.vanilla/package.env
deleted file mode 100644
index 67fe0dff..00000000
--- a/tools-uclibc/portage.i686.vanilla/package.env
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/wget net-misc_wget_0