diff --git a/aoc2021/src/day08.rs b/aoc2021/src/day08.rs
index 7ec0260..a61474b 100644
--- a/aoc2021/src/day08.rs
+++ b/aoc2021/src/day08.rs
@@ -8,6 +8,7 @@ pub fn run() -> Result<String> {
     let mut res = String::with_capacity(128);
 
     writeln!(res, "part 1: {}", part1(INPUT)?)?;
+    writeln!(res, "part 2: {}", part2(INPUT)?)?;
 
     Ok(res)
 }
@@ -21,20 +22,148 @@ fn part1(input: &str) -> Result<usize> {
     Ok(entries.iter().map(Entry::count_easy_digits_in_output).sum())
 }
 
+fn part2(input: &str) -> Result<u64> {
+    let entries = input
+        .lines()
+        .map(TryInto::try_into)
+        .collect::<Result<Vec<Entry>>>()?;
+
+    let mut sum = 0;
+
+    for entry in entries {
+        let mapping = entry.compute_mapping()?;
+        sum += entry.decode_output(&mapping)?;
+    }
+
+    Ok(sum)
+}
+
 struct Entry<'a> {
     four_digits_output: Vec<&'a str>,
+    unique_signals: Vec<&'a str>,
 }
 
 impl<'a> Entry<'a> {
     fn count_easy_digits_in_output(&self) -> usize {
         self.four_digits_output
             .iter()
-            .filter(|digit| Self::is_easy_digit(digit))
+            .filter_map(|digit| Self::translate_easy_digit(digit))
             .count()
     }
 
-    fn is_easy_digit(digit: &str) -> bool {
-        matches!(digit.len(), 2 | 3 | 4 | 7)
+    fn translate_easy_digit(digit: &str) -> Option<u64> {
+        match digit.len() {
+            2 => Some(1),
+            3 => Some(7),
+            4 => Some(4),
+            7 => Some(8),
+            _ => None,
+        }
+    }
+
+    fn compute_mapping(&self) -> Result<Vec<(&'a str, u64)>> {
+        let mut mapping = Vec::new();
+
+        // first, let's get the easy digits
+        self.unique_signals
+            .iter()
+            .filter_map(|signal| Self::translate_easy_digit(signal).zip(Some(signal)))
+            .for_each(|(translation, &signal)| {
+                mapping.push((signal, translation));
+            });
+
+        // now we can get `9` for free: it's the signal that uses 6 segments and has 4 in common
+        // with the digit `4` (`6` and `0` also use 6 segments, but only have 3 segments in common
+        // with `4`).
+        let (four, _) = *mapping
+            .iter()
+            .find(|(_, translation)| *translation == 4)
+            .context("no signal found for the digit 4!")?;
+        let nine = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 6)
+            .find(|signal| four.chars().all(|c| signal.contains(c)))
+            .context("couldn't identify any signal corresponding to the digit 9!")?;
+        mapping.push((nine, 9));
+
+        // `0` has 2 segments in common with `1`, while `6` only has 1.
+        let (one, _) = *mapping
+            .iter()
+            .find(|(_, translation)| *translation == 1)
+            .context("no signal found for the digit 1!")?;
+        let zero = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 6)
+            .filter(|signal| *signal != nine)
+            .find(|signal| one.chars().all(|c| signal.contains(c)))
+            .context("couldn't identify any signal corresponding to the digit 0!")?;
+        mapping.push((zero, 0));
+
+        // `6` is an easy one now, the only other signal with 6 segments, that isn't nine or zero.
+        let six = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 6)
+            .find(|signal| *signal != nine && *signal != zero)
+            .context("couldn't identify any signal corresponding to the digit 6!")?;
+        mapping.push((six, 6));
+
+        // `2`, `3` and `5` have 5 segments each.
+        //
+        // `3` has 2 segments in common with `1`.
+        let three = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 5)
+            .find(|signal| one.chars().all(|c| signal.contains(c)))
+            .context("couldn't identify any signal corresponding to the digit 3!")?;
+        mapping.push((three, 3));
+
+        // `5` has all its segments used in `6`, `2` doesn't.
+        let five = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 5)
+            .find(|signal| signal.chars().all(|c| six.contains(c)))
+            .context("couldn't identify any signal corresponding to the digit 5!")?;
+        mapping.push((five, 5));
+
+        // `2` is the last one!
+        let two = self
+            .unique_signals
+            .iter()
+            .filter(|signal| signal.len() == 5)
+            .find(|signal| *signal != five && *signal != three)
+            .context("couldn't identify any signal corresponding to the digit 2!")?;
+        mapping.push((two, 2));
+
+        debug_assert_eq!(mapping.len(), 10);
+
+        Ok(mapping)
+    }
+
+    fn decode_output(&self, digit_mapping: &[(&str, u64)]) -> Result<u64> {
+        let mut res = 0;
+        for digit in &self.four_digits_output {
+            // search is kind of ugly, but having to sort everything is probably time consuming as
+            // well.
+            let digit = digit_mapping
+                .iter()
+                .find_map(|(signal, translation)| {
+                    if digit.len() == signal.len() && digit.chars().all(|c| signal.contains(c)) {
+                        Some(translation)
+                    } else {
+                        None
+                    }
+                })
+                .with_context(|| format!("couldn't translate digit `{}`", digit))?;
+
+            res = (res * 10) + digit;
+        }
+
+        Ok(res)
     }
 }
 
@@ -42,10 +171,11 @@ impl<'a> TryFrom<&'a str> for Entry<'a> {
     type Error = anyhow::Error;
 
     fn try_from(s: &'a str) -> Result<Self, Self::Error> {
-        let (_, output) = s.split_once(" | ").context("couldn't split on ` | `")?;
+        let (signals, output) = s.split_once(" | ").context("couldn't split on ` | `")?;
 
         Ok(Self {
             four_digits_output: output.trim().split(' ').collect(),
+            unique_signals: signals.trim().split(' ').collect(),
         })
     }
 }
@@ -65,4 +195,14 @@ mod tests {
     fn part1_real() {
         assert_eq!(part1(INPUT).unwrap(), 488);
     }
+
+    #[test]
+    fn part2_provided() {
+        assert_eq!(part2(PROVIDED).unwrap(), 61229);
+    }
+
+    #[test]
+    fn part2_real() {
+        assert_eq!(part2(INPUT).unwrap(), 1040429);
+    }
 }