diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f834c2..4377e54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ Fixes
 ### MLEM.Extended
 Improvements
 - Updated to FontStashSharp 1.3.0's API
+- Expose character and line spacing in GenericStashFont
 
 ### MLEM.Data
 Fixes
diff --git a/MLEM.Extended/Font/GenericStashFont.cs b/MLEM.Extended/Font/GenericStashFont.cs
index f9a5b74..961e13e 100644
--- a/MLEM.Extended/Font/GenericStashFont.cs
+++ b/MLEM.Extended/Font/GenericStashFont.cs
@@ -11,6 +11,7 @@ namespace MLEM.Extended.Font {
         /// The <see cref="SpriteFontBase"/> that is being wrapped by this generic font
         /// </summary>
         public readonly SpriteFontBase Font;
+
         /// <inheritdoc />
         public override GenericFont Bold { get; }
         /// <inheritdoc />
@@ -18,6 +19,15 @@ namespace MLEM.Extended.Font {
         /// <inheritdoc />
         public override float LineHeight => this.Font.LineHeight;
 
+        /// <summary>
+        /// The character spacing that will be passed to the underlying <see cref="Font"/>.
+        /// </summary>
+        public float CharacterSpacing { get; set; }
+        /// <summary>
+        /// The line spacing that will be passed to the underlying <see cref="Font"/>.
+        /// </summary>
+        public float LineSpacing { get; set; }
+
         /// <summary>
         /// Creates a new generic font using <see cref="SpriteFontBase"/>.
         /// Optionally, a bold and italic version of the font can be supplied.
@@ -33,12 +43,12 @@ namespace MLEM.Extended.Font {
 
         /// <inheritdoc />
         protected override float MeasureCharacter(int codePoint) {
-            return this.Font.MeasureString(CodePointSource.ToString(codePoint)).X;
+            return this.Font.MeasureString(CodePointSource.ToString(codePoint), null, this.CharacterSpacing, this.LineSpacing).X;
         }
 
         /// <inheritdoc />
         protected override void DrawCharacter(SpriteBatch batch, int codePoint, string character, Vector2 position, Color color, float rotation, Vector2 scale, SpriteEffects effects, float layerDepth) {
-            this.Font.DrawText(batch, character, position, color, rotation, Vector2.Zero, scale, layerDepth);
+            this.Font.DrawText(batch, character, position, color, rotation, Vector2.Zero, scale, layerDepth, this.CharacterSpacing, this.LineSpacing);
         }
 
     }