--- ufed	2012-08-18 00:24:07.000000000 +0200
+++ ufed	2012-09-18 21:46:38.366844844 +0200
@@ -29,7 +29,7 @@
 	@{$use_descriptions{$_}} = "(Unknown)"
 	if not exists $use_descriptions{$_};
 }
-@{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf';
+@{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/[portage/]make.conf';
 
 for(@Portage::archs) {
 	delete $Portage::default_flags{$_};
@@ -155,10 +155,11 @@
 
 	my (@flags) = @_;
 	my $contents;
+	my $makeconfname = ( -e '/etc/portage/make.conf' ) ? '/etc/portage/make.conf' : '/etc/make.conf';
 
 	{
-		open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
-		open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n";
+		open my $makeconf, '<', $makeconfname or die "Couldn't open $makeconfname\n";
+		open my $makeconfold, '>', "${makeconfname}.old" or die "Couldn't open ${makeconfname}.old\n";
 		local $/;
 		$_ = <$makeconf>;
 		print $makeconfold $_;
@@ -293,11 +294,11 @@
 	die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@;
 
 	print STDERR <<EOF if $sourcing;
-Warning: source command found in /etc/make.conf. Flags may
+Warning: source command found in ${makeconfname}. Flags may
 be saved incorrectly if the sourced file modifies them.
 EOF
 	{
-		open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
+		open my $makeconf, '>', $makeconfname or die "Couldn't open $makeconfname\n";
 		print $makeconf $_;
 		close $makeconf;
 	}