diff --git a/lib/Lacuna/DB/Result/Building/Module.pm b/lib/Lacuna/DB/Result/Building/Module.pm
index af1ed601..1182ecf0 100644
--- a/lib/Lacuna/DB/Result/Building/Module.pm
+++ b/lib/Lacuna/DB/Result/Building/Module.pm
@@ -108,5 +108,51 @@ around demolish => sub {
     }
 };
 
+sub food_capacity {
+    my ($self) = @_;
+    my $base = $self->food_storage * $self->production_hour;
+    return 0 if $base == 0;
+    my $empire = $self->body->empire;
+    return 1 unless defined $empire;
+    return sprintf('%.0f', $base );
+}
+
+sub energy_capacity {
+    my ($self) = @_;
+    my $base = $self->energy_storage * $self->production_hour;
+    return 0 if $base == 0;
+    my $empire = $self->body->empire;
+    return 1 unless defined $empire;
+    return sprintf('%.0f', $base );
+}
+
+sub ore_capacity {
+    my ($self) = @_;
+    my $base = $self->ore_storage * $self->production_hour;
+    return 0 if $base == 0;
+    my $empire = $self->body->empire;
+    return 1 unless defined $empire;
+    return sprintf('%.0f', $base );
+}
+
+sub water_capacity {
+    my ($self) = @_;
+    my $base = $self->water_storage * $self->production_hour;
+    return 0 if $base == 0;
+    my $empire = $self->body->empire;
+    return 1 unless defined $empire;
+    return sprintf('%.0f', $base );
+}
+
+sub waste_capacity {
+    my ($self) = @_;
+    my $base = $self->waste_storage * $self->production_hour;
+    return 0 if $base == 0;
+    my $empire = $self->body->empire;
+    return 1 unless defined $empire;
+    return sprintf('%.0f', $base );
+}
+
+
 no Moose;
 __PACKAGE__->meta->make_immutable(inline_constructor => 0);
diff --git a/lib/Lacuna/DB/Result/Building/Module/Warehouse.pm b/lib/Lacuna/DB/Result/Building/Module/Warehouse.pm
index ed630e14..1dc54f51 100644
--- a/lib/Lacuna/DB/Result/Building/Module/Warehouse.pm
+++ b/lib/Lacuna/DB/Result/Building/Module/Warehouse.pm
@@ -8,10 +8,10 @@ extends 'Lacuna::DB::Result::Building::Module';
 use constant controller_class => 'Lacuna::RPC::Building::Warehouse';
 use constant image => 'warehouse';
 use constant name => 'Warehouse';
-use constant food_storage   => 4000;
-use constant water_storage  => 4000;
-use constant ore_storage    => 4000;
-use constant energy_storage => 4000;
+use constant food_storage   => 6000;
+use constant water_storage  => 6000;
+use constant ore_storage    => 6000;
+use constant energy_storage => 6000;
 use constant energy_consumption => 80;
 use constant water_consumption => 80;
 use constant food_consumption => 80;
diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt
index 401b5409..8d46d179 100644
--- a/var/www/public/changes.txt
+++ b/var/www/public/changes.txt
@@ -6,6 +6,7 @@
  - Add: per-colony notes in PCC
  - Fix: Oracles now work even during colonisation (60-second timer).
  - Fix: Starter Zone limit enforced.
+ - Mod: Warehouses no longer use affinities or storage boosts.
 
 3.0911:
  - Add: Reduce opacity for less-well-controlled stars.