diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf5c88..040c4d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.9+2
+
+- Change version constraint for the `shelf` dependency, so it accepts null-safe versions.
+
 ## 0.2.9+1
 
 * Change version constraint for the `mime` dependency, so it accepts null-safe versions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 46aaf56..a8ddebf 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -6,37 +6,40 @@
 
 linter:
   rules:
+  - avoid_bool_literals_in_conditional_expressions
   - avoid_catching_errors
-  - avoid_empty_else
+  - avoid_classes_with_only_static_members
   - avoid_function_literals_in_foreach_calls
-  - avoid_init_to_null
-  - avoid_null_checks_in_equality_operators
   - avoid_private_typedef_functions
   - avoid_redundant_argument_values
   - avoid_renaming_method_parameters
+  - avoid_returning_null
+  - avoid_returning_null_for_future
   - avoid_returning_null_for_void
+  - avoid_returning_this
+  - avoid_single_cascade_in_expression_statements
   - avoid_unused_constructor_parameters
   - avoid_void_async
   - await_only_futures
   - camel_case_types
   - cancel_subscriptions
   - cascade_invocations
+  - comment_references
   - constant_identifier_names
   - control_flow_in_finally
   - directives_ordering
-  - empty_catches
-  - empty_constructor_bodies
   - empty_statements
   - file_names
   - hash_and_equals
   - implementation_imports
+  - invariant_booleans
   - iterable_contains_unrelated_type
   - join_return_with_assignment
-  - library_names
-  - library_prefixes
   - lines_longer_than_80_chars
   - list_remove_unrelated_type
+  - literal_only_boolean_expressions
   - missing_whitespace_between_adjacent_strings
+  - no_adjacent_strings_in_list
   - no_runtimeType_toString
   - non_constant_identifier_names
   - only_throw_errors
@@ -47,39 +50,31 @@
   - prefer_asserts_in_initializer_lists
   - prefer_const_constructors
   - prefer_const_declarations
-  - prefer_equal_for_default_values
   - prefer_expression_function_bodies
-  - prefer_final_fields
   - prefer_final_locals
   - prefer_function_declarations_over_variables
-  - prefer_generic_function_type_aliases
   - prefer_initializing_formals
   - prefer_inlined_adds
   - prefer_interpolation_to_compose_strings
-  - prefer_is_not_empty
   - prefer_is_not_operator
   - prefer_null_aware_operators
   - prefer_relative_imports
   - prefer_typing_uninitialized_variables
   - prefer_void_to_null
   - provide_deprecation_message
-  - slash_for_doc_comments
   - sort_pub_dependencies
   - test_types_in_equals
   - throw_in_finally
   - type_annotate_public_apis
-  - type_init_formals
+  - unnecessary_await_in_return
   - unnecessary_brace_in_string_interps
-  - unnecessary_const
+  - unnecessary_getters_setters
   - unnecessary_lambdas
-  - unnecessary_new
   - unnecessary_null_aware_assignments
   - unnecessary_overrides
   - unnecessary_parenthesis
   - unnecessary_statements
   - unnecessary_string_interpolations
-  - unrelated_type_equality_checks
   - use_is_even_rather_than_modulo
   - use_string_buffers
-  - valid_regexps
   - void_checks
diff --git a/pubspec.yaml b/pubspec.yaml
index bdca446..f828265 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: shelf_static
-version: 0.2.9+1
-description: Static file server support for Shelf
-homepage: https://github.com/dart-lang/shelf_static
+version: 0.2.9+2
+description: Static file server support for shelf
+repository: https://github.com/dart-lang/shelf_static
 
 environment:
   sdk: '>=2.3.0 <3.0.0'
@@ -11,10 +11,9 @@
   http_parser: '>=0.0.2+2 <5.0.0'
   mime: '>=0.9.0 <=1.0.0'
   path: '>=1.1.0 <2.0.0'
-  shelf: '>=0.5.7 <0.8.0'
+  shelf: '>=0.5.7 <2.0.0'
 
 dev_dependencies:
   args: '^1.0.0'
   test: '^1.2.0'
   test_descriptor: '^1.0.0'
-