diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py
index 9e9c135f8..0293e7662 100644
--- a/gui/builtinViewColumns/__init__.py
+++ b/gui/builtinViewColumns/__init__.py
@@ -1,5 +1,5 @@
 __all__ = ["moduleState", "moduleNameOrSlot", "attributeDisplay", "maxRange",
-           "name", "droneDps", "droneNameAmount", "droneCheckbox"]
+           "name", "droneDps", "droneNameAmount", "droneCheckbox", "moduleAmmo"]
 
 columns = {}
 def registerColumn(column):
diff --git a/gui/builtinViewColumns/moduleAmmo.py b/gui/builtinViewColumns/moduleAmmo.py
new file mode 100755
index 000000000..6a713f0c4
--- /dev/null
+++ b/gui/builtinViewColumns/moduleAmmo.py
@@ -0,0 +1,49 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from gui import builtinViewColumns
+from gui.viewColumn import ViewColumn
+from gui import bitmapLoader
+
+class ModuleAmmo(ViewColumn):
+    name = "Module Ammo"
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        self.columnText = "Ammo"
+
+    def getText(self, mod):
+        return mod.charge.name if mod.charge is not None else ""
+
+    def getImageId(self, mod):
+        if mod.charge is None:
+            iconId = -1
+        else:
+            iconFile = mod.charge.icon.iconFile if mod.item.icon else ""
+            if iconFile:
+                bitmap = bitmapLoader.getBitmap(iconFile, "pack")
+                if bitmap is None:
+                    iconId = -1
+                else:
+                    iconId = self.fittingView.imageList.Add(bitmap)
+            else:
+                iconId = -1
+
+        return iconId
+
+builtinViewColumns.registerColumn(ModuleAmmo)
diff --git a/gui/fittingView.py b/gui/fittingView.py
index 5bccf60a3..53ee24d7e 100644
--- a/gui/fittingView.py
+++ b/gui/fittingView.py
@@ -34,7 +34,8 @@ class FittingView(d.Display):
                     "attr:cpu",
                     "attr:capacitorNeed",
                     "attr:trackingSpeed",
-                    "Max range"]
+                    "Max range",
+                    "Module Ammo"]
 
     def __init__(self, parent):
         d.Display.__init__(self, parent)